diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-03 18:29:57 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-03 18:29:57 +0000 |
| commit | 6509bb23b1ba1fa694b84fe7e63dd905830ec5f4 (patch) | |
| tree | bd41bcd3e565070a0f9fcace8d28c789500b060e | |
| parent | 74fef112ae691424eff1ee9f039f2d3bc0636639 (diff) | |
| download | gcc-6509bb23b1ba1fa694b84fe7e63dd905830ec5f4.tar.gz | |
* Makefile.tpl: Make GCC use a separate config.cache.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75360 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | Makefile.tpl | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2fd95c81af7..213ae74f42d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-01-03 Nathanael Nerode <neroden@gcc.gnu.org> + * Makefile.tpl: Make GCC use a separate config.cache. + * Makefile.in: Regenerate. + PR bootstrap/11932, PR bootstrap/11933 (I don't know if it will fix either of them, but it relates to them.) diff --git a/Makefile.in b/Makefile.in index 8fe85ff369f..c8dad9cc65d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23572,6 +23572,9 @@ install-target-rda: installdirs # build modules. So GCC is a sort of hybrid. # gcc is the only module which uses GCC_FLAGS_TO_PASS. +# Don't use shared host config.cache, as it will confuse later +# directories; GCC wants slightly different values for some +# precious variables. *sigh* .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: configure-gcc: @@ -23609,7 +23612,7 @@ configure-gcc: libsrcdir="$$s/gcc";; \ esac; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ + $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \ || exit 1 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that diff --git a/Makefile.tpl b/Makefile.tpl index 3b545c46095..af5b2910c8c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1069,6 +1069,9 @@ install-target-[+module+]: installdirs # build modules. So GCC is a sort of hybrid. # gcc is the only module which uses GCC_FLAGS_TO_PASS. +# Don't use shared host config.cache, as it will confuse later +# directories; GCC wants slightly different values for some +# precious variables. *sigh* .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: configure-gcc: @@ -1106,7 +1109,7 @@ configure-gcc: libsrcdir="$$s/gcc";; \ esac; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ + $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \ || exit 1 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that |