X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=bd962e15ac48ffd4b1daa00b26841edade1c941d;hb=5d0747c093ee5b45e08871503c6210662958657b;hp=5dff483062f401539ddfb454e91db9d204042b64;hpb=0f183f73e2ad22b2a2225a388d024e0559862c66;p=ghc-hetmet.git

diff --git a/rules/package-config.mk b/rules/package-config.mk
index 5dff483..bd962e1 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -12,12 +12,12 @@
 
 
 define package-config # args: $1 = dir, $2 = distdir, $3 = GHC stage
+$(call trace, package-config($1,$2,$3))
 
 $1_$2_HC = $$(GHC_STAGE$3)
 
 # configuration stuff that depends on which GHC we're building with
 ifeq "$3" "0"
-$1_$2_ghc_ge_609 = $$(ghc_ge_609)
 $1_$2_ghc_ge_6102 = $$(ghc_ge_6102)
 $1_$2_ghc_ge_611 = $$(ghc_ge_611)
 $1_$2_ghc_ge_613 = $$(ghc_ge_613)
@@ -33,11 +33,11 @@ $1_$2_HC_DEP =
 $1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
 $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
 $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
+$1_$2_HC_OPTS += -no-user-package-conf
 ifeq "$(ghc_ge_613)" "YES"
 $1_$2_HC_OPTS += -rtsopts
 endif
 else
-$1_$2_ghc_ge_609 = YES
 $1_$2_ghc_ge_6102 = YES
 $1_$2_ghc_ge_611 = YES
 $1_$2_ghc_ge_613 = YES