From 2c9c0bf77376404fbc80359c9ec39626f5238959 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 8 Jun 2008 16:19:22 +0000 Subject: * Makefile.def (flags_to_pass): Add LDFLAGS_FOR_BUILD. * Makefile.tpl (EXTRA_BUILD_FLAGS): Define. (all prefix="build-"): Pass them to build-system sub-makes. * Makefile.in: Regenerate. config: * config/mh-mingw (LDFLAGS): Define. --- Makefile.tpl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Makefile.tpl') diff --git a/Makefile.tpl b/Makefile.tpl index ea2676fced6..c9b34eda22d 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -147,6 +147,12 @@ BUILD_EXPORTS = \ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; +# 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. +EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring @@ -955,7 +961,8 @@ clean-stage[+id+]-[+prefix+][+module+]: target_alias=(get "target" "${target_alias}") args="$(BUILD_CONFIGARGS)" no-config-site=true +] -[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +] +[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" + args="$(EXTRA_BUILD_FLAGS)" +] [+ ENDFOR build_module +] # -------------------------------------- -- cgit v1.2.1