diff options
author | Ian Lynagh <igloo@earth.li> | 2011-01-15 23:19:27 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2011-01-15 23:19:27 +0000 |
commit | a3be88fd60cc63b97ec8509f46a8d93025760792 (patch) | |
tree | eb73ab10e25592144b88a4dc80edd99adc18ea40 /rules/package-config.mk | |
parent | 18fe16c9d3468c818d4fd650f47cfd6971e578b5 (diff) | |
download | haskell-a3be88fd60cc63b97ec8509f46a8d93025760792.tar.gz |
Build system improvements
We no longer use dummy-ghc; instead we don't configure most packages
until the stage1 compiler is available.
We also now use Cabal for building the ghc-bin package.
There are a couple more sanity checks too.
Diffstat (limited to 'rules/package-config.mk')
-rw-r--r-- | rules/package-config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/package-config.mk b/rules/package-config.mk index fbed905aba..871fde6775 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -38,8 +38,8 @@ endif else $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 = |