X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=88e2c63171d7a37533c73687fe4ca288868586e6;hp=949a7b4b7dc81a1221157f602dfb0f8d59eba562;hb=0856ac59cfb455d32a3042317fdba0f5e85cab9c;hpb=fcf5e6563cdbaddc0816b5fb65ebc16fd55fcb6b

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 949a7b4..88e2c63 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -10,7 +10,11 @@
 #
 # -----------------------------------------------------------------------------
 
-define build-package-data # args: $1 = dir, $2 = distdir
+define build-package-data
+# args:
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
 
 ifeq "$$(filter p,$$(GhcLibWays))" "p"
 $1_$2_CONFIGURE_OPTS += --enable-library-profiling
@@ -27,7 +31,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)) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)"
+$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_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)"
 
 ifneq "$$(ICONV_INCLUDE_DIRS)" ""
@@ -44,12 +48,14 @@ endif
 $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP)
 	"$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
 ifeq "$$($1_$2_PROG)" ""
-ifeq "$$(ghc_ge_6102) $$($1_$2_USE_BOOT_LIBS)" "NO YES" # NOTE [1] below
+ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
+ifeq "$$(ghc_ge_6102) $3" "NO 0" # NOTE [1] below
 	    cat $1/$2/inplace-pkg-config | sed "s@^import-dirs:@import-dirs: $(TOP)/$1 $(TOP)/$1/src @" | "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) -
 else
 	    "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
 endif
 endif
+endif
 
 # [1] this is a hack for GHC <= 6.10.1.  When making dependencies with
 # ghc -M, in GHC 6.10.1 and earlier, GHC needed to find either the .hi