diff options
author | Manfred Hollstein <manfred@gcc.gnu.org> | 1998-06-26 02:13:51 +0000 |
---|---|---|
committer | Manfred Hollstein <manfred@gcc.gnu.org> | 1998-06-26 02:13:51 +0000 |
commit | f1943b772f833a3e511c35a78cc90607e752a202 (patch) | |
tree | 51d261c8aa76a052e642e4bccf8260e143210109 /gcc | |
parent | e4bfc274846798f11a977e98f27c442ad90ca000 (diff) | |
download | gcc-f1943b772f833a3e511c35a78cc90607e752a202.zip gcc-f1943b772f833a3e511c35a78cc90607e752a202.tar.gz gcc-f1943b772f833a3e511c35a78cc90607e752a202.tar.bz2 |
Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger.
d
egcs/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger.
(Makefile): Depend on $(gcc_version_trigger).
* configure (gcc_version): Change default initializer to empty
string.
(gcc_version_trigger): New variable; pass this variable down
to subdir configures to enable them checking gcc's version
themselves. Emit make macros for both gcc_version vars.
(topsrcdir): Initialize reliably.
(recursion line): Remove --with-gcc-version=${gcc_version}.
egcs/gcc/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (gcc_version, gcc_version_trigger): New macros.
(version): Initialize from $(gcc_version).
* configure.in (version): Rename to gcc_version.
(gcc_version_trigger): New variable; call AC_SUBST for it and
emit it into the generated config.status.
* configure: Regenerate.
egcs/libf2c/ChangeLog.egcs:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (gcc_version_trigger): Add new macro.
(config.status): Add dependency upon $(gcc_version_trigger).
* configure.in (gcc_version_trigger): New variable; initialize
using value from toplevel configure; add AC_SUBST for it.
(gcc_version): Change initialization to use this new variable.
* configure: Regenerate.
egcs/libio/ChangeLog:
1998-06-26 Manfred Hollstein <manfred@s-direktnet.de>
* config.shared (FLAGS_TO_PASS): Add gcc_version_trigger.
(Makefile): Add dependency upon $(gcc_version_trigger).
From-SVN: r20736
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/Makefile.in | 5 | ||||
-rwxr-xr-x | gcc/configure | 18 | ||||
-rw-r--r-- | gcc/configure.in | 15 |
3 files changed, 28 insertions, 10 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index dab02f6..f8b3b74 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -245,7 +245,10 @@ lang_specs_files=@lang_specs_files@ lang_options_files=@lang_options_files@ GCC_THREAD_FILE=@thread_file@ GTHREAD_FLAGS=@gthread_flags@ -version=@version@ +# Be prepared for gcc2 merges. +gcc_version=@gcc_version@ +gcc_version_trigger=@gcc_version_trigger@ +version=$(gcc_version) mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c` # Common prefix for installation directories. diff --git a/gcc/configure b/gcc/configure index eb6c427c..7448427 100755 --- a/gcc/configure +++ b/gcc/configure @@ -4969,8 +4969,13 @@ if [ x$host_truncate_target != x ]; then target=`echo $target | sed -e 's/\(..............\).*/\1/'` fi -# Get the version number from the toplevel -version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/version.c` +# Get the version trigger filename from the toplevel +if [ "${with_gcc_version_trigger+set}" = set ]; then + gcc_version_trigger=$with_gcc_version_trigger +else + gcc_version_trigger=${srcdir}/version.c +fi +gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}` # Get an absolute path to the GCC top-level source directory holddir=`pwd` @@ -5134,7 +5139,7 @@ fi # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:5138: checking assembler alignment features" >&5 +echo "configure:5143: checking assembler alignment features" >&5 gcc_cv_as= gcc_cv_as_alignment_features= if [ -x as$host_exeext ]; then @@ -5425,6 +5430,7 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma + # Echo that links are built if [ x$host = x$target ] then @@ -5662,7 +5668,8 @@ s%@host_xm_file_list@%$host_xm_file_list%g s%@lang_specs_files@%$lang_specs_files%g s%@lang_options_files@%$lang_options_files%g s%@thread_file@%$thread_file%g -s%@version@%$version%g +s%@gcc_version@%$gcc_version%g +s%@gcc_version_trigger@%$gcc_version_trigger%g s%@local_prefix@%$local_prefix%g s%@gxx_include_dir@%$gxx_include_dir%g s%@fixincludes@%$fixincludes%g @@ -5909,7 +5916,8 @@ host_xmake_file='${host_xmake_file}' dep_tmake_file='${dep_tmake_file}' tmake_file='${tmake_file}' thread_file='${thread_file}' -version='${version}' +gcc_version='${gcc_version}' +gcc_version_trigger='${gcc_version_trigger}' local_prefix='${local_prefix}' build_install_headers_dir='${build_install_headers_dir}' build_exeext='${build_exeext}' diff --git a/gcc/configure.in b/gcc/configure.in index 6667857..731b8fd 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -3125,8 +3125,13 @@ if [[ x$host_truncate_target != x ]]; then target=`echo $target | sed -e 's/\(..............\).*/\1/'` fi -# Get the version number from the toplevel -version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${srcdir}/version.c` +# Get the version trigger filename from the toplevel +if [[ "${with_gcc_version_trigger+set}" = set ]]; then + gcc_version_trigger=$with_gcc_version_trigger +else + gcc_version_trigger=${srcdir}/version.c +fi +gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${gcc_version_trigger}` # Get an absolute path to the GCC top-level source directory holddir=`pwd` @@ -3551,7 +3556,8 @@ AC_SUBST(host_xm_file_list) AC_SUBST(lang_specs_files) AC_SUBST(lang_options_files) AC_SUBST(thread_file) -AC_SUBST(version) +AC_SUBST(gcc_version) +AC_SUBST(gcc_version_trigger) AC_SUBST(local_prefix) AC_SUBST(gxx_include_dir) AC_SUBST(fixincludes) @@ -3654,7 +3660,8 @@ host_xmake_file='${host_xmake_file}' dep_tmake_file='${dep_tmake_file}' tmake_file='${tmake_file}' thread_file='${thread_file}' -version='${version}' +gcc_version='${gcc_version}' +gcc_version_trigger='${gcc_version_trigger}' local_prefix='${local_prefix}' build_install_headers_dir='${build_install_headers_dir}' build_exeext='${build_exeext}' |