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/build-package-data.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/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index ffaacd69ff..be33eabdb4 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -62,10 +62,13 @@ ifeq "$3" "0" $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) endif +$1/$2/inplace-pkg-config : $1/$2/package-data.mk +$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk + # This rule configures the package, generates the package-data.mk file # for our build system, and registers the package for use in-place in # the build tree. -$1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP) +$1/$2/package-data.mk : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP) "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 ifeq "$$($1_$2_PROG)" "" ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" |