X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=fbed905aba2f52eed4853c8c917e61711c017627;hb=2247d4c49e705ee88f5249368e718c12897fe103;hp=c30f11724e7db3b3ce5e4a39d5b802c7c93b467a;hpb=4b8a6d6c34bd74a4e3ac4d5d3c19e1236b1882dd;p=ghc-hetmet.git

diff --git a/rules/package-config.mk b/rules/package-config.mk
index c30f117..fbed905 100644
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -12,13 +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_6102 = $$(ghc_ge_6102)
-$1_$2_ghc_ge_611 = $$(ghc_ge_611)
 $1_$2_ghc_ge_613 = $$(ghc_ge_613)
 $1_$2_HC_CONFIG = $$(GHC_STAGE0)
 $1_$2_HC_CONFIG_DEP =
@@ -32,12 +31,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_6102 = YES
-$1_$2_ghc_ge_611 = YES
 $1_$2_ghc_ge_613 = YES
 $1_$2_HC_PKGCONF = 
 $1_$2_HC_CONFIG = $$(TOP)/$$(DUMMY_GHC_INPLACE)