Fix some makefile logic, and remove the now unused *_USE_BOOT_LIBS vars

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

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 949a7b4..81913dc 100644 (file)
--- 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
@@ -44,7 +48,7 @@ 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
+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