X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=1e2311fbd7fbe2baf3bb5432863c8c18620957ad;hb=5564a292733352343495a977b27e497e81ea58c6;hp=79591dff42c8f2dd244d36a915ca07ad442de8d5;hpb=f75901581bf98293fe825b726326da92d2723003;p=ghc-hetmet.git

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 79591df..1e2311f 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