aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.def1
-rw-r--r--Makefile.in3
-rw-r--r--Makefile.tpl2
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b92284..6b1ce8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-13 Kelley Cook <kcook@gcc.gnu.org>
+
+ PR bootstrap/18222
+ * Makefile.def: Pass CPPFLAGS_FOR_TARGET.
+ * Makefile.tpl: Define target CPPFLAGS on CPPFLAGS_FOR_TARGET.
+ * Makefile.in: Regenerate.
+
2005-01-03 Paolo Bonzini <bonzini@gnu.org>
Revert 2004-12-28 Makefile changes, a better fix will be
diff --git a/Makefile.def b/Makefile.def
index 5a7f319..c6d39f4 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -218,6 +218,7 @@ flags_to_pass = { flag= AR_FOR_TARGET ; };
flags_to_pass = { flag= AS_FOR_TARGET ; };
flags_to_pass = { flag= CC_FOR_TARGET ; };
flags_to_pass = { flag= CFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= CXX_FOR_TARGET ; };
flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
diff --git a/Makefile.in b/Makefile.in
index 45c4059..dff7568 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -198,7 +198,7 @@ BASE_TARGET_EXPORTS = \
CC="$(CC_FOR_TARGET)"; export CC; \
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
@@ -552,6 +552,7 @@ BASE_FLAGS_TO_PASS = \
"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+ "CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
diff --git a/Makefile.tpl b/Makefile.tpl
index 44c15fd..597cb80 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -201,7 +201,7 @@ BASE_TARGET_EXPORTS = \
CC="$(CC_FOR_TARGET)"; export CC; \
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \