X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=86f9323859ae3b5303dd240e621d04380f862309;hp=3392d904d0b28cae4733df7637455960ca95848e;hb=2c1c4d3540e5671274d45a473f1d1da5d37f76c1;hpb=eb3a1aecac72d22c618b4050fb88eac9055b527a

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 3392d90..86f9323 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -40,7 +40,7 @@ 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) $$(CONF_LD_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_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)"
 
 ifneq "$$(ICONV_INCLUDE_DIRS)" ""
@@ -64,6 +64,7 @@ $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS)
 endif
 
 ifneq "$$(BINDIST)" "YES"
+ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES"
 $1/$2/inplace-pkg-config : $1/$2/package-data.mk
 $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk
 
@@ -78,6 +79,7 @@ ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
 endif
 endif
 endif
+endif
 
 PACKAGE_DATA_MKS += $1/$2/package-data.mk