X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fpackage-config.mk;h=871fde677542f417a19622497d8b02c6d078a70b;hb=a3be88fd60cc63b97ec8509f46a8d93025760792;hp=bd962e15ac48ffd4b1daa00b26841edade1c941d;hpb=75d9236613acdcfa54deb81b12bd4546c31e7c9f;p=ghc-hetmet.git diff --git a/rules/package-config.mk b/rules/package-config.mk index bd962e1..871fde6 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -18,8 +18,6 @@ $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 = @@ -38,12 +36,10 @@ 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) -$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 =