diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-12-07 01:00:33 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-12-07 01:00:33 +0000 |
| commit | 75cd9c50ea68a5e426e3105735713b8015d63413 (patch) | |
| tree | d42739ff3a6766b255264844527861e9efb05ffe /rules | |
| parent | c0eb9d997653da4357873829990cc338475bca39 (diff) | |
| download | haskell-75cd9c50ea68a5e426e3105735713b8015d63413.tar.gz | |
Make CPPFLAGS variables, as well as CFLAGS and LDFLAGS
This fixes the "does unsetenv return void" test in the unix package on
OS X, if I tell it to make 10.4-compatible binaries. The test uses
CPPFLAGS but not CFLAGS, so it thought it returned int (as it was
in 10.5-mode), but the C compiler (using CFLAGS, so in 10.4 mode)
thought it returned void.
I also added CONF_LD_OPTS_STAGE$3 to the list of things in LDFLAGS,
which looks like an accidental ommission.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 9b8474a248..a74e096e4a 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -39,7 +39,8 @@ endif # for a feature it may not generate warning-free C code, and thus may # think that the feature doesn't exist if -Werror is on. $1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)" -$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" +$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_LD_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" +$1_$2_CONFIGURE_OPTS += --configure-option=CPPFLAGS="$$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_OPTS)" ifneq "$$(ICONV_INCLUDE_DIRS)" "" $1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="$$(ICONV_INCLUDE_DIRS)" |