diff options
| author | Iavor S. Diatchki <diatchki@galois.com> | 2012-04-27 13:28:20 -0700 |
|---|---|---|
| committer | Iavor S. Diatchki <diatchki@galois.com> | 2012-04-27 13:28:20 -0700 |
| commit | 7befd215db8272ec6301abf1a05e6347da5d3ec8 (patch) | |
| tree | 1fd2bf5323c1656d7ba81ac227b139fce53f0612 /rules/build-package-data.mk | |
| parent | d209588a40928e21a253bc9341689b5174c00cfc (diff) | |
| parent | 753360701b115747140a4056dbf1e126059aa8ef (diff) | |
| download | haskell-7befd215db8272ec6301abf1a05e6347da5d3ec8.tar.gz | |
Merge remote-tracking branch 'origin/master' into pretty-build
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index dedd9c2558..25b27741e3 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -39,7 +39,7 @@ endif # We filter out -Werror from SRC_CC_OPTS, because when configure tests # 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=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS) $$(SRC_CC_WARNING_OPTS)" $1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_GCC_LINKER_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)" |