X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=f111e1efac195284692d011df49d392443903ebe;hb=295016c3c0aa1f407436136e39ababf2dc8b50c6;hp=b68f2e1de5927a6175aa702a3fe58aa98335aa29;hpb=814946f35c725c22f67979642828dbefcaeaf8c3;p=ghc-hetmet.git

diff --git a/rules/package-config.mk b/rules/package-config.mk
index b68f2e1..f111e1e 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,17 +31,15 @@ $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
+$1_$2_MORE_HC_OPTS += -no-user-package-conf
 ifeq "$(ghc_ge_613)" "YES"
-$1_$2_HC_OPTS += -rtsopts
+$1_$2_MORE_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)
-$1_$2_HC_CONFIG_DEP = $$(DUMMY_GHC_INPLACE)
+$1_$2_HC_CONFIG = $$(TOP)/$$(GHC_STAGE1)
+$1_$2_HC_CONFIG_DEP = $$(GHC_STAGE1)
 $1_$2_GHC_PKG = $$(TOP)/$$(GHC_PKG_INPLACE)
 $1_$2_GHC_PKG_DEP = $$(GHC_PKG_INPLACE)
 $1_$2_GHC_PKG_OPTS =
@@ -51,8 +48,8 @@ $1_$2_GHC_PKG_OPTS =
 $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1)
 $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND)
 $1_$2_HC_DEP = $$($1_$2_HC)
-$1_$2_HC_OPTS += -no-user-package-conf
-$1_$2_HC_OPTS += -rtsopts
+$1_$2_MORE_HC_OPTS += -no-user-package-conf
+$1_$2_MORE_HC_OPTS += -rtsopts
 endif
 
 # Useful later