From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21824 invoked by alias); 21 Oct 2008 20:16:39 -0000 Received: (qmail 21516 invoked by uid 22791); 21 Oct 2008 20:16:33 -0000 X-Spam-Check-By: sourceware.org Received: from NaN.false.org (HELO nan.false.org) (208.75.86.248) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 21 Oct 2008 20:15:37 +0000 Received: from nan.false.org (localhost [127.0.0.1]) by nan.false.org (Postfix) with ESMTP id F176810199; Tue, 21 Oct 2008 20:15:34 +0000 (GMT) Received: from caradoc.them.org (209.195.188.212.nauticom.net [209.195.188.212]) by nan.false.org (Postfix) with ESMTP id 54A6010700; Tue, 21 Oct 2008 20:15:34 +0000 (GMT) Received: from drow by caradoc.them.org with local (Exim 4.69) (envelope-from ) id 1KsNdd-0004cZ-9s; Tue, 21 Oct 2008 16:15:33 -0400 Date: Tue, 21 Oct 2008 20:16:00 -0000 From: Daniel Jacobowitz To: gcc-patches@gcc.gnu.org Cc: binutils@sourceware.org, gdb-patches@sourceware.org Subject: RFA: Save LDFLAGS and CPPFLAGS at the top level Message-ID: <20081021201533.GA17491@caradoc.them.org> Mail-Followup-To: gcc-patches@gcc.gnu.org, binutils@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Mutt/1.5.17 (2008-05-11) X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2008-10/txt/msg00181.txt.bz2 This patch should make all of {CPP,LD}FLAGS{,_FOR_TARGET,_FOR_BUILD} work from the top level. The GDB simulator directories don't always listen to them (partially tested patch posted), and I'm sure there are other omissions, but this fixes what I could find by inspection. Tested by building an arm-none-eabi simulator for both current Linux host and cross-built Windows host, with CPPFLAGS/LDFLAGS set before running configure, and checking every command in the log. Without this patch those CPPFLAGS and LDFLAGS are not used, with it they are. OK? --=20 Daniel Jacobowitz CodeSourcery 2008-10-21 Daniel Jacobowitz PR gdb/921 PR gdb/1646 PR gdb/2175 PR gdb/2176 * Makefile.def (flags_to_pass): Add CPPFLAGS_FOR_BUILD and CPPFLAGS. * Makefile.tpl (BUILD_EXPORTS): Set CPPFLAGS. (EXTRA_BUILD_FLAGS): Correct typo. Pass CPPFLAGS. (HOST_EXPORTS): Pass CPPFLAGS. (CPPFLAGS_FOR_BUILD, CPPFLAGS, CPPFLAGS_FOR_TARGET): Define. (LDFLAGS_FOR_TARGET): Initialize from configure script. (EXTRA_TARGET_FLAGS): Set CPPFLAGS. * Makefile.in, configure: Regenerated. * configure.ac: Set CPPFLAGS_FOR_TARGET, LDFLAGS_FOR_TARGET, and CPPFLAGS_FOR_BUILD. 2008-10-21 Daniel Jacobowitz * Makefile.in (CPPFLAGS): Define. (FLAGS_TO_PASS, COMPILE.c): Add CPPFLAGS. Index: Makefile.def =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.def,v retrieving revision 1.92 diff -u -p -r1.92 Makefile.def --- Makefile.def 30 Jul 2008 15:03:54 -0000 1.92 +++ Makefile.def 21 Oct 2008 19:30:11 -0000 @@ -208,6 +208,7 @@ flags_to_pass =3D { flag=3D target_alias ; } flags_to_pass =3D { flag=3D BISON ; }; flags_to_pass =3D { flag=3D CC_FOR_BUILD ; }; flags_to_pass =3D { flag=3D CFLAGS_FOR_BUILD ; }; +flags_to_pass =3D { flag=3D CPPFLAGS_FOR_BUILD ; }; flags_to_pass =3D { flag=3D CXX_FOR_BUILD ; }; flags_to_pass =3D { flag=3D EXPECT ; }; flags_to_pass =3D { flag=3D FLEX ; }; @@ -232,6 +233,7 @@ flags_to_pass =3D { flag=3D BOOT_ADAFLAGS ;=20 flags_to_pass =3D { flag=3D BOOT_CFLAGS ; }; flags_to_pass =3D { flag=3D BOOT_LDFLAGS ; }; flags_to_pass =3D { flag=3D CFLAGS ; }; +flags_to_pass =3D { flag=3D CPPFLAGS ; }; flags_to_pass =3D { flag=3D CXXFLAGS ; }; flags_to_pass =3D { flag=3D LDFLAGS ; }; flags_to_pass =3D { flag=3D LIBCFLAGS ; }; Index: Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.in,v retrieving revision 1.287 diff -u -p -r1.287 Makefile.in --- Makefile.in 4 Sep 2008 02:18:16 -0000 1.287 +++ Makefile.in 21 Oct 2008 19:30:13 -0000 @@ -137,6 +137,7 @@ BUILD_EXPORTS =3D \ CC=3D"$(CC_FOR_BUILD)"; export CC; \ CFLAGS=3D"$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ CONFIG_SHELL=3D"$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS=3D"$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ CXX=3D"$(CXX_FOR_BUILD)"; export CXX; \ CXXFLAGS=3D"$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ GCJ=3D"$(GCJ_FOR_BUILD)"; export GCJ; \ @@ -150,9 +151,10 @@ BUILD_EXPORTS =3D \ WINDMC=3D"$(WINDMC_FOR_BUILD)"; export WINDMC; =20 # These variables must be set on the make command line for directories -# built for the build system to override those in BASE_FLAGS_TO_PASSS. +# built for the build system to override those in BASE_FLAGS_TO_PASS. EXTRA_BUILD_FLAGS =3D \ CFLAGS=3D"$(CFLAGS_FOR_BUILD)" \ + CPPFLAGS=3D"$(CPPFLAGS_FOR_BUILD)" \ LDFLAGS=3D"$(LDFLAGS_FOR_BUILD)" =20 # This is the list of directories to built for the host system. @@ -172,6 +174,7 @@ HOST_EXPORTS =3D \ ADA_CFLAGS=3D"$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS=3D"$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL=3D"$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS=3D"$(CFLAGS)"; export CPPFLAGS; \ CXX=3D"$(CXX)"; export CXX; \ CXXFLAGS=3D"$(CXXFLAGS)"; export CXXFLAGS; \ AR=3D"$(AR)"; export AR; \ @@ -275,6 +278,7 @@ AR_FOR_BUILD =3D @AR_FOR_BUILD@ AS_FOR_BUILD =3D @AS_FOR_BUILD@ CC_FOR_BUILD =3D @CC_FOR_BUILD@ CFLAGS_FOR_BUILD =3D @CFLAGS_FOR_BUILD@ +CPPFLAGS_FOR_BUILD =3D @CPPFLAGS_FOR_BUILD@ CXXFLAGS_FOR_BUILD =3D @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD =3D @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD =3D @DLLTOOL_FOR_BUILD@ @@ -336,6 +340,7 @@ GNATBIND =3D @GNATBIND@ GNATMAKE =3D @GNATMAKE@ =20 CFLAGS =3D @CFLAGS@ +CPPFLAGS =3D @CPPFLAGS@ LDFLAGS =3D @LDFLAGS@ LIBCFLAGS =3D $(CFLAGS) CXXFLAGS =3D @CXXFLAGS@ @@ -399,13 +404,14 @@ COMPILER_LD_FOR_TARGET=3D@COMPILER_LD_FOR_ COMPILER_NM_FOR_TARGET=3D@COMPILER_NM_FOR_TARGET@ =20 CFLAGS_FOR_TARGET =3D @CFLAGS_FOR_TARGET@ +CPPFLAGS_FOR_TARGET =3D @CPPFLAGS_FOR_TARGET@ CXXFLAGS_FOR_TARGET =3D @CXXFLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET =3D @SYSROOT_CFLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET =3D @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ =20 LIBCFLAGS_FOR_TARGET =3D $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET =3D $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET =3D=20 +LDFLAGS_FOR_TARGET =3D @LDFLAGS_FOR_TARGET@ =20 # ------------------------------------ # Miscellaneous targets and flag lists @@ -505,6 +511,7 @@ BASE_FLAGS_TO_PASS =3D \ "BISON=3D$(BISON)" \ "CC_FOR_BUILD=3D$(CC_FOR_BUILD)" \ "CFLAGS_FOR_BUILD=3D$(CFLAGS_FOR_BUILD)" \ + "CPPFLAGS_FOR_BUILD=3D$(CPPFLAGS_FOR_BUILD)" \ "CXX_FOR_BUILD=3D$(CXX_FOR_BUILD)" \ "EXPECT=3D$(EXPECT)" \ "FLEX=3D$(FLEX)" \ @@ -527,6 +534,7 @@ BASE_FLAGS_TO_PASS =3D \ "BOOT_CFLAGS=3D$(BOOT_CFLAGS)" \ "BOOT_LDFLAGS=3D$(BOOT_LDFLAGS)" \ "CFLAGS=3D$(CFLAGS)" \ + "CPPFLAGS=3D$(CPPFLAGS)" \ "CXXFLAGS=3D$(CXXFLAGS)" \ "LDFLAGS=3D$(LDFLAGS)" \ "LIBCFLAGS=3D$(LIBCFLAGS)" \ @@ -617,6 +625,7 @@ EXTRA_TARGET_FLAGS =3D \ 'AS=3D$(COMPILER_AS_FOR_TARGET)' \ 'CC=3D$$(CC_FOR_TARGET)' \ 'CFLAGS=3D$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREF= IX_CFLAGS_FOR_TARGET)' \ + 'CPPFLAGS=3D$$(CPPFLAGS_FOR_TARGET)' \ 'CXX=3D$$(CXX_FOR_TARGET)' \ 'CXXFLAGS=3D$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_= PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=3D$$(DLLTOOL_FOR_TARGET)' \ Index: Makefile.tpl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/Makefile.tpl,v retrieving revision 1.194 diff -u -p -r1.194 Makefile.tpl --- Makefile.tpl 4 Sep 2008 02:18:16 -0000 1.194 +++ Makefile.tpl 21 Oct 2008 19:30:13 -0000 @@ -140,6 +140,7 @@ BUILD_EXPORTS =3D \ CC=3D"$(CC_FOR_BUILD)"; export CC; \ CFLAGS=3D"$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ CONFIG_SHELL=3D"$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS=3D"$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ CXX=3D"$(CXX_FOR_BUILD)"; export CXX; \ CXXFLAGS=3D"$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ GCJ=3D"$(GCJ_FOR_BUILD)"; export GCJ; \ @@ -153,9 +154,10 @@ BUILD_EXPORTS =3D \ WINDMC=3D"$(WINDMC_FOR_BUILD)"; export WINDMC; =20 # These variables must be set on the make command line for directories -# built for the build system to override those in BASE_FLAGS_TO_PASSS. +# built for the build system to override those in BASE_FLAGS_TO_PASS. EXTRA_BUILD_FLAGS =3D \ CFLAGS=3D"$(CFLAGS_FOR_BUILD)" \ + CPPFLAGS=3D"$(CPPFLAGS_FOR_BUILD)" \ LDFLAGS=3D"$(LDFLAGS_FOR_BUILD)" =20 # This is the list of directories to built for the host system. @@ -175,6 +177,7 @@ HOST_EXPORTS =3D \ ADA_CFLAGS=3D"$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS=3D"$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL=3D"$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS=3D"$(CFLAGS)"; export CPPFLAGS; \ CXX=3D"$(CXX)"; export CXX; \ CXXFLAGS=3D"$(CXXFLAGS)"; export CXXFLAGS; \ AR=3D"$(AR)"; export AR; \ @@ -278,6 +281,7 @@ AR_FOR_BUILD =3D @AR_FOR_BUILD@ AS_FOR_BUILD =3D @AS_FOR_BUILD@ CC_FOR_BUILD =3D @CC_FOR_BUILD@ CFLAGS_FOR_BUILD =3D @CFLAGS_FOR_BUILD@ +CPPFLAGS_FOR_BUILD =3D @CPPFLAGS_FOR_BUILD@ CXXFLAGS_FOR_BUILD =3D @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD =3D @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD =3D @DLLTOOL_FOR_BUILD@ @@ -339,6 +343,7 @@ GNATBIND =3D @GNATBIND@ GNATMAKE =3D @GNATMAKE@ =20 CFLAGS =3D @CFLAGS@ +CPPFLAGS =3D @CPPFLAGS@ LDFLAGS =3D @LDFLAGS@ LIBCFLAGS =3D $(CFLAGS) CXXFLAGS =3D @CXXFLAGS@ @@ -402,13 +407,14 @@ COMPILER_LD_FOR_TARGET=3D@COMPILER_LD_FOR_ COMPILER_NM_FOR_TARGET=3D@COMPILER_NM_FOR_TARGET@ =20 CFLAGS_FOR_TARGET =3D @CFLAGS_FOR_TARGET@ +CPPFLAGS_FOR_TARGET =3D @CPPFLAGS_FOR_TARGET@ CXXFLAGS_FOR_TARGET =3D @CXXFLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET =3D @SYSROOT_CFLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET =3D @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ =20 LIBCFLAGS_FOR_TARGET =3D $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET =3D $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET =3D=20 +LDFLAGS_FOR_TARGET =3D @LDFLAGS_FOR_TARGET@ =20 # ------------------------------------ # Miscellaneous targets and flag lists @@ -515,6 +521,7 @@ EXTRA_TARGET_FLAGS =3D \ 'AS=3D$(COMPILER_AS_FOR_TARGET)' \ 'CC=3D$$(CC_FOR_TARGET)' \ 'CFLAGS=3D$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREF= IX_CFLAGS_FOR_TARGET)' \ + 'CPPFLAGS=3D$$(CPPFLAGS_FOR_TARGET)' \ 'CXX=3D$$(CXX_FOR_TARGET)' \ 'CXXFLAGS=3D$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_= PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=3D$$(DLLTOOL_FOR_TARGET)' \ Index: configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/configure,v retrieving revision 1.305 diff -u -p -r1.305 configure --- configure 4 Sep 2008 02:18:16 -0000 1.305 +++ configure 21 Oct 2008 19:30:14 -0000 @@ -272,7 +272,7 @@ PACKAGE_STRING=3D PACKAGE_BUGREPORT=3D =20 ac_unique_file=3D"move-if-change" -ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS= build build_cpu build_vendor build_os build_noncanonical host_noncanonical= target_noncanonical host host_cpu host_vendor host_os target target_cpu ta= rget_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S b= uild_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPP= FLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND= GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT= _CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAG= S_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_= GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configa= rgs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFL= AGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BU= ILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_F= OR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX = FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES = WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_= TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET L= D_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TA= RGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARG= ET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_= NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflag= s stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBO= BJS LTLIBOBJS' +ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPLEVEL_CONFIGURE_ARGUMENTS= build build_cpu build_vendor build_os build_noncanonical host_noncanonical= target_noncanonical host host_cpu host_vendor host_os target target_cpu ta= rget_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S b= uild_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPP= FLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND= GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT= _CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAG= S_FOR_TARGET CPPFLAGS_FOR_TARGET LDFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_= SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_c= onfigargs build_configdirs host_configargs configdirs target_configargs AR_= FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CPPFLAGS_FOR_BUILD CXX= FLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_= BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_F= OR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXP= ECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OB= JDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_F= OR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO= _FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TA= RGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARG= ET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAI= NTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking= stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS' ac_subst_files=3D'serialization_dependencies host_makefile_frag target_mak= efile_frag alphaieee_frag ospace_frag' ac_pwd=3D`pwd` =20 @@ -5287,6 +5287,12 @@ if test "x$CXXFLAGS_FOR_TARGET" =3D x; the fi =20 =20 +# Other target tools. +CPPFLAGS_FOR_TARGET=3D${CPPFLAGS_FOR_TARGET-${CPPFLAGS}} + +LDFLAGS_FOR_TARGET=3D${LDFLAGS_FOR_TARGET-${LDFLAGS}} + + # Handle --with-headers=3DXXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" !=3D x && test x"${with_headers}" !=3D xno ; th= en @@ -6034,6 +6040,7 @@ esac # our build compiler if desired. if test x"${build}" =3D x"${host}" ; then CFLAGS_FOR_BUILD=3D${CFLAGS_FOR_BUILD-${CFLAGS}} + CPPFLAGS_FOR_BUILD=3D${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} CXXFLAGS_FOR_BUILD=3D${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} LDFLAGS_FOR_BUILD=3D${LDFLAGS_FOR_BUILD-${LDFLAGS}} fi @@ -6112,6 +6119,7 @@ done =20 =20 =20 + # Generate default definitions for YACC, M4, LEX and other programs that r= un # on the build machine. These are used if the Makefile can't locate these # programs in objdir. @@ -12980,6 +12988,8 @@ s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_C s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t +s,@CPPFLAGS_FOR_TARGET@,$CPPFLAGS_FOR_TARGET,;t t +s,@LDFLAGS_FOR_TARGET@,$LDFLAGS_FOR_TARGET,;t t s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t s,@GCC_SHLIB_SUBDIR@,$GCC_SHLIB_SUBDIR,;t t s,@tooldir@,$tooldir,;t t @@ -12996,6 +13006,7 @@ s,@AR_FOR_BUILD@,$AR_FOR_BUILD,;t t s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t +s,@CPPFLAGS_FOR_BUILD@,$CPPFLAGS_FOR_BUILD,;t t s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t Index: configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/configure.ac,v retrieving revision 1.51 diff -u -p -r1.51 configure.ac --- configure.ac 4 Sep 2008 02:18:16 -0000 1.51 +++ configure.ac 21 Oct 2008 19:30:14 -0000 @@ -1743,6 +1743,12 @@ if test "x$CXXFLAGS_FOR_TARGET" =3D x; the fi AC_SUBST(CXXFLAGS_FOR_TARGET) =20 +# Other target tools. +CPPFLAGS_FOR_TARGET=3D${CPPFLAGS_FOR_TARGET-${CPPFLAGS}} +AC_SUBST(CPPFLAGS_FOR_TARGET) +LDFLAGS_FOR_TARGET=3D${LDFLAGS_FOR_TARGET-${LDFLAGS}} +AC_SUBST(LDFLAGS_FOR_TARGET) + # Handle --with-headers=3DXXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" !=3D x && test x"${with_headers}" !=3D xno ; th= en @@ -2481,6 +2487,7 @@ esac # our build compiler if desired. if test x"${build}" =3D x"${host}" ; then CFLAGS_FOR_BUILD=3D${CFLAGS_FOR_BUILD-${CFLAGS}} + CPPFLAGS_FOR_BUILD=3D${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} CXXFLAGS_FOR_BUILD=3D${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} LDFLAGS_FOR_BUILD=3D${LDFLAGS_FOR_BUILD-${LDFLAGS}} fi @@ -2546,6 +2553,7 @@ AC_SUBST(AR_FOR_BUILD) AC_SUBST(AS_FOR_BUILD) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CFLAGS_FOR_BUILD) +AC_SUBST(CPPFLAGS_FOR_BUILD) AC_SUBST(CXXFLAGS_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD) AC_SUBST(DLLTOOL_FOR_BUILD) Index: libiberty/Makefile.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/libiberty/Makefile.in,v retrieving revision 1.93 diff -u -p -r1.93 Makefile.in --- libiberty/Makefile.in 16 Oct 2008 02:47:08 -0000 1.93 +++ libiberty/Makefile.in 21 Oct 2008 19:30:15 -0000 @@ -55,6 +55,7 @@ AR_FLAGS =3D rc =20 CC =3D @CC@ CFLAGS =3D @CFLAGS@ +CPPFLAGS =3D @CPPFLAGS@ RANLIB =3D @RANLIB@ MAKEINFO =3D @MAKEINFO@ PERL =3D @PERL@ @@ -78,6 +79,7 @@ FLAGS_TO_PASS =3D \ "AR_FLAGS=3D$(AR_FLAGS)" \ "CC=3D$(CC)" \ "CFLAGS=3D$(CFLAGS)" \ + "CPPFLAGS=3D$(CPPFLAGS)" \ "DESTDIR=3D$(DESTDIR)" \ "EXTRA_OFILES=3D$(EXTRA_OFILES)" \ "HDEFINES=3D$(HDEFINES)" \ @@ -109,7 +111,7 @@ installcheck: installcheck-subdir =20 INCDIR=3D$(srcdir)/$(MULTISRCTOP)../include =20 -COMPILE.c =3D $(CC) -c @DEFS@ $(CFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_li= biberty_warn_cflags@ +COMPILE.c =3D $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEF= INES) @ac_libiberty_warn_cflags@ =20 # Just to make sure we don't use a built-in rule with VPATH .c.o: