2006-06-15 Paolo Bonzini <bonzini@gnu.org>

	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Export CFLAGS and LDFLAGS
	too.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 70a0978d91bbcef10e9e797729eb29db3e22d801..661380ac4dce82201070d6ffaa003debd5456b9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15  Paolo Bonzini  <bonzini@gnu.org>
+
+       * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Export CFLAGS and LDFLAGS
+       too.
+       * Makefile.in: Regenerate.
+
 2006-06-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        Sync from gcc:
@@ -77,6 +83,7 @@
        * config-ml.in: Alter CCASFLAGS to include special
        multilib options the same as is done for CFLAGS.
 
+>>>>>>> 1.659
 2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * Makefile.def: Added dependencies from sim and gdb on intl, and

diff --git a/Makefile.in b/Makefile.in
index 2cbfbdb91224ec527dafe1219de269e576446032..432f03dd16ad521112d89f22a96402b3e6ad9405 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,7 +177,9 @@ POSTSTAGE1_HOST_EXPORTS = \
        CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
          $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
          -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
+         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
+       CFLAGS="$(BOOT_CFLAGS)"; export CFLAGS; \
+       LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
 
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@

diff --git a/Makefile.tpl b/Makefile.tpl
index 8f1a7bc6d3a9de55b650e9bd65529748385ba42c..f5ab350bad6e966cadd5611d4342fecd6a53aad6 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -180,7 +180,9 @@ POSTSTAGE1_HOST_EXPORTS = \
        CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
          $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
          -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
+         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
+       CFLAGS="$(BOOT_CFLAGS)"; export CFLAGS; \
+       LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
 
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@