config/gcc-version.m4 missing in HEAD

Zack Weinberg zack@codesourcery.com
Mon Mar 21 10:54:00 GMT 2005


Daniel Jacobowitz <drow@false.org> writes:
> On Mon, Mar 21, 2005 at 01:26:53AM +0100, Simon Richter wrote:
>> This file is required for rebuilding the configure script. Is it
>> possible to re-add it or remove the reference from configure.in?
>
> The latter - Zack's working on this on gcc-patches@.

I assume you are both talking about the use of TL_AC_GCC_VERSION in
the top level configure.in.  Allow me to share the patch that I hope
to check in on the gcc side shortly.  (configure and Makefile.in must
be regenerated after applying.)

zw

===================================================================
Index: configure.in
--- configure.in	28 Feb 2005 13:24:59 -0000	1.343
+++ configure.in	21 Mar 2005 01:53:56 -0000
@@ -19,7 +19,6 @@
 ### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
 
 sinclude(config/acx.m4)
-sinclude(config/gcc-version.m4)
 sinclude(config/gxx-include-dir.m4)
 
 AC_INIT(move-if-change)
@@ -101,22 +100,6 @@ topsrcdir=$srcpwd
 
 extra_host_args=
 
-# Define the trigger file to make sure configure will re-run whenever
-# the gcc version number changes.
-TL_AC_GCC_VERSION([$topsrcdir])
-if test -f $gcc_version_trigger ; then
-  case "$ac_configure_args" in
-    *--with-gcc-version-trigger=$gcc_version_trigger* )
-      ;;
-    * )
-      # Add to all subconfigure arguments: build, host, and target.
-      ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger"
-      ;;
-  esac
-else
-  gcc_version_trigger=
-fi
-
 ### To add a new directory to the tree, first choose whether it is a target
 ### or a host dependent tool.  Then put it into the appropriate list
 ### (library or tools, host or target), doing a dependency sort.
@@ -1966,9 +1949,6 @@ fi
 # Pass the appropriate --host, --build, and --cache-file arguments.
 target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
 
-# provide a proper gxx_include_dir.
-TL_AC_GXX_INCLUDE_DIR
-
 FLAGS_FOR_TARGET=
 case " $target_configdirs " in
  *" newlib "*)
===================================================================
Index: Makefile.def
--- Makefile.def	28 Feb 2005 13:24:42 -0000	1.48
+++ Makefile.def	21 Mar 2005 01:53:56 -0000
@@ -172,8 +172,6 @@ flags_to_pass = { flag= infodir ; };
 flags_to_pass = { flag= libdir ; };
 flags_to_pass = { flag= libexecdir ; };
 flags_to_pass = { flag= lispdir ; };
-flags_to_pass = { flag= libstdcxx_incdir ; };
-flags_to_pass = { flag= libsubdir ; };
 flags_to_pass = { flag= localstatedir ; };
 flags_to_pass = { flag= mandir ; };
 flags_to_pass = { flag= oldincludedir ; };
@@ -183,9 +181,6 @@ flags_to_pass = { flag= sharedstatedir ;
 flags_to_pass = { flag= sysconfdir ; };
 flags_to_pass = { flag= tooldir ; };
 flags_to_pass = { flag= build_tooldir ; };
-flags_to_pass = { flag= gxx_include_dir ; };
-flags_to_pass = { flag= gcc_version ; };
-flags_to_pass = { flag= gcc_version_trigger ; };
 flags_to_pass = { flag= target_alias ; };
 
 // Build tools
===================================================================
Index: Makefile.tpl
--- Makefile.tpl	16 Mar 2005 15:34:55 -0000	1.127
+++ Makefile.tpl	21 Mar 2005 01:53:56 -0000
@@ -75,21 +75,12 @@ LN_S = @LN_S@
 # Miscellaneous non-standard autoconf-set variables
 # -------------------------------------------------
 
-# The file containing GCC's version number.
-gcc_version_trigger = @gcc_version_trigger@
-gcc_version = @gcc_version@
-
 # The gcc driver likes to know the arguments it was configured with.
 TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
 
-gxx_include_dir = @gxx_include_dir@
-libstdcxx_incdir = @libstdcxx_incdir@
-
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
 
-# Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
 GDB_NLM_DEPS = 
 
 # This is the name of the environment variable used for the path to
@@ -1673,7 +1664,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-config.status: configure $(gcc_version_trigger)
+config.status: configure
 	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
 
 # Rebuilding configure.



More information about the Binutils mailing list