X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=e1c563235e8e01a097b77840d864ac971859519c;hb=80637c9b178f54f1eb5352695463dad8ef3c7fc0;hp=2801ff56b681b6dfedf2181a102d7af99ad54de9;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git diff --git a/rules/package-config.mk b/rules/package-config.mk index 2801ff5..e1c5632 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -17,7 +17,7 @@ $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_609 = $$(ghc_ge_609) $1_$2_HC_CONFIG = $$(GHC_STAGE0) $1_$2_HC_CONFIG_DEP = $1_$2_GHC_PKG = $$(GHC_PKG) @@ -28,7 +28,7 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC) $1_$2_HC_MK_DEPEND_DEP = $1_$2_HC_DEP = ifeq "$$($1_$2_USE_BOOT_LIBS)" "YES" -$1_$2_HC_PKGCONF = -package-conf $(BOOTSTRAPPING_CONF) +$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) endif