From c62e151251d4b1d572b309c5343ef4856e9719f0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 20 Feb 2008 14:26:59 +0000 Subject: 2008-02-20 Paolo Bonzini PR bootstrap/32009 PR bootstrap/32161 * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here. * configure: Regenerate. * Makefile.def: Define stage_libcflags for all bootstrap stages. * Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS, STAGE4_LIBCFLAGS): New. (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without $(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET). (BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS. (EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS. (configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags for target modules. Don't export LIBCFLAGS. (all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass $(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. (invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with $(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS). * Makefile.in: Regenerate. config: 2008-02-20 Paolo Bonzini PR bootstrap/32009 * mh-ppc-darwin (BOOT_CFLAGS): Reenable. --- Makefile.def | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index 85463fbe4b..a68722598b 100644 --- a/Makefile.def +++ b/Makefile.def @@ -511,43 +511,51 @@ bootstrap_stage = { // compiler probably has never heard of them. stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_cflags='$(STAGE1_CFLAGS)' ; }; + stage_cflags='$(STAGE1_CFLAGS)' ; + stage_libcflags='$(STAGE1_LIBCFLAGS)' ; }; bootstrap_stage = { id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS)" ; }; + stage_cflags="$(STAGE2_CFLAGS)" ; + stage_libcflags="$(STAGE2_LIBCFLAGS)" ; }; bootstrap_stage = { id=b2g0 ; prev=1 ; bootstrap_target=bootstrap2-debug ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS) -g0" ; }; + stage_cflags="$(STAGE2_CFLAGS) -g0" ; + stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; cleanstrap_target=cleanstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS)" ; }; + stage_cflags="$(STAGE3_CFLAGS)" ; + stage_libcflags="$(STAGE3_LIBCFLAGS)" ; }; bootstrap_stage = { id=b3g2 ; prev=b2g0 ; lean=1 ; compare_target=compare-debug ; bootstrap_target=bootstrap-debug ; cleanstrap_target=cleanstrap-debug ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS) -g2" ; }; + stage_cflags="$(STAGE3_CFLAGS) -g2" ; + stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; bootstrap_target=bootstrap4 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE4_CFLAGS)" ; }; + stage_cflags="$(STAGE4_CFLAGS)" ; + stage_libcflags="$(STAGE4_CFLAGS)" ; }; bootstrap_stage = { id=profile ; prev=1 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; }; + stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; + stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; }; bootstrap_stage = { id=feedback ; prev=profile ; bootstrap_target=profiledbootstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; }; + stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; -- cgit v1.2.1