Fix Windows memory freeing: add a check for fb == NULL; fixes trac #4506

[ghc-hetmet.git] / rules / build-package-data.mk

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index d254638..a74e096 100644 (file)
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -11,6 +11,7 @@
 # -----------------------------------------------------------------------------
 
 define build-package-data
+$(call trace, build-package-data($1,$2,$3))
 # args:
 # $1 = dir
 # $2 = distdir
@@ -24,7 +25,7 @@ ifeq "$$(filter dyn,$$(GhcLibWays))" "dyn"
 $1_$2_CONFIGURE_OPTS += --enable-shared
 endif
 
-ifeq "$$(GhcWithInterpreter) $$(UseArchivesForGhci)" "YES NO"
+ifeq "$$(GhcWithInterpreter)" "YES"
 $1_$2_CONFIGURE_OPTS += --enable-library-for-ghci
 else
 $1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
@@ -38,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)"