diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-03-07 13:58:27 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-03-07 13:58:27 +0100 |
| commit | 3b9edeac73a88b00a06b1822a25fdd287315b146 (patch) | |
| tree | 8d95a2193b9506c42c9447eaa26c7f7540983997 | |
| parent | 040c446d0dac893caa5106c459525a92c27d5750 (diff) | |
| download | gcc-3b9edeac73a88b00a06b1822a25fdd287315b146.zip gcc-3b9edeac73a88b00a06b1822a25fdd287315b146.tar.gz gcc-3b9edeac73a88b00a06b1822a25fdd287315b146.tar.bz2 | |
re PR bootstrap/58572 (make bootstrap-lean leads to installation failure (doing extra rebuilds and invoking system compiler))
PR bootstrap/58572
* Makefile.tpl (POSTSTAGE1_CXX_EXPORT): Use -isystem instead of
-I for libstdc++-v3 includes if $(LEAN).
* Makefile.in: Regenerated.
From-SVN: r208400
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | Makefile.tpl | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2014-03-07 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/58572 + * Makefile.tpl (POSTSTAGE1_CXX_EXPORT): Use -isystem instead of + -I for libstdc++-v3 includes if $(LEAN). + * Makefile.in: Regenerated. + 2014-03-04 Jonathan Wakely <jwakely@redhat.com> * MAINTAINERS: Update my email address. diff --git a/Makefile.in b/Makefile.in index f9e8e0d..287bffd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -239,9 +239,9 @@ POSTSTAGE1_CXX_EXPORT = \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ - -I$$s/libstdc++-v3/libsupc++ \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \ export CXX; \ diff --git a/Makefile.tpl b/Makefile.tpl index 92f3f61..54a8dc3 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -242,9 +242,9 @@ POSTSTAGE1_CXX_EXPORT = \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ - -I$$s/libstdc++-v3/libsupc++ \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \ export CXX; \ |