diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-06-15 21:47:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-06-15 21:47:58 +0000 |
| commit | 284647dd59e9b036f51950ce24332847a3f932b4 (patch) | |
| tree | 46b7346fbe8413c73bb40b802926fa30405f965e /rules | |
| parent | f75901581bf98293fe825b726326da92d2723003 (diff) | |
| download | haskell-284647dd59e9b036f51950ce24332847a3f932b4.tar.gz | |
Make sure we aren't passing -Werror in the CFLAGS for configure scripts
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.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 79591dff42..1e2311fbd7 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -20,7 +20,10 @@ ifeq "$(HSCOLOUR_SRCS)" "YES" $1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR)" endif -$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(SRC_CC_OPTS) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)" +# 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)) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)" $1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)" # This rule configures the package, generates the package-data.mk file |