re PR bootstrap/58572 (make bootstrap-lean leads to installation failure (doing extra...

	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

diff --git a/ChangeLog b/ChangeLog
index 9dfe79ac6b9cfcbf115d96140c20dbb8045a99cf..f8ad1c3bb749dbefb6d08efc28e4d3d5c6d4c242 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f9e8e0d5cb79fe0eb0bf4773ee095f0e28bf9acb..287bffd131fccdd4ea565ac7e20087fe25fe7ec9 100644 (file)
--- 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 92f3f6156c6b9bd42bc775b8bdb331d72e10071a..54a8dc3dd40c56147db454f430b6e9a0c3d53c1f 100644 (file)
--- 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; \