diff options
author | Kelley Cook <kcook@gcc.gnu.org> | 2005-01-17 23:50:27 +0000 |
---|---|---|
committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2005-01-17 23:50:27 +0000 |
commit | e7daab310880734a511535e7ad024e98a63dd2c3 (patch) | |
tree | 9c6ed07591768a0dfd523bbc60c91e6f216c5949 | |
parent | dbc522ef398a62f70767ef3eb5c2fdcc11b622ab (diff) | |
download | gcc-e7daab310880734a511535e7ad024e98a63dd2c3.zip gcc-e7daab310880734a511535e7ad024e98a63dd2c3.tar.gz gcc-e7daab310880734a511535e7ad024e98a63dd2c3.tar.bz2 |
re PR libgcj/18222 (libjava bootstrap failure on Tru64 UNIX: CPPFLAGS changed in libltdl)
2005-01-17 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.
From-SVN: r93796
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.def | 1 | ||||
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | Makefile.tpl | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-01-17 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-16 Jason Thorpe <thorpej@netbsd.org> * MAINTAINERS: Update my email address. 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; \ |