diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2005-03-22 00:49:18 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@codesourcery.com> | 2005-03-22 00:49:18 +0000 |
| commit | 9e6daff153e91439bd05d763c0011cd5efdceb91 (patch) | |
| tree | a21024a87cc730ea3a9e0e64e66fb893146aa189 /Makefile.in | |
| parent | d4eb89201886c2a3b5505d829402e69ed6cfb0b3 (diff) | |
| download | cygnal-9e6daff153e91439bd05d763c0011cd5efdceb91.tar.gz cygnal-9e6daff153e91439bd05d763c0011cd5efdceb91.tar.bz2 cygnal-9e6daff153e91439bd05d763c0011cd5efdceb91.zip | |
top:
* Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir,
gcc_version, and gcc_version_trigger from set of flags to pass.
* Makefile.tpl: Remove definitions of above variables.
(config.status): Remove dependency on $(gcc_version_trigger).
* Makefile.in: Regenerate.
* configure.in: Do not reference config/gcc-version.m4 nor
config/gxx-include-dir.m4. Do not invoke TL_AC_GCC_VERSION nor
TL_AC_GXX_INCLUDE_DIR. Do not set gcc_version_trigger.
* configure: Regenerate.
config:
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
to be expanded by the Makefile.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 84c36bb41..aeef11eb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,21 +72,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 @@ -520,8 +511,6 @@ BASE_FLAGS_TO_PASS = \ "libdir=$(libdir)" \ "libexecdir=$(libexecdir)" \ "lispdir=$(lispdir)" \ - "libstdcxx_incdir=$(libstdcxx_incdir)" \ - "libsubdir=$(libsubdir)" \ "localstatedir=$(localstatedir)" \ "mandir=$(mandir)" \ "oldincludedir=$(oldincludedir)" \ @@ -531,9 +520,6 @@ BASE_FLAGS_TO_PASS = \ "sysconfdir=$(sysconfdir)" \ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ - "gxx_include_dir=$(gxx_include_dir)" \ - "gcc_version=$(gcc_version)" \ - "gcc_version_trigger=$(gcc_version_trigger)" \ "target_alias=$(target_alias)" \ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ @@ -35515,7 +35501,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def 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. |