diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-16 15:39:32 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-16 16:23:51 +0000 |
| commit | ac5a314504554ddef0e855ef9e2fcf51e961f4a6 (patch) | |
| tree | f1cbca12d13992189769fd0d41ab21e336ff80b4 /rules/build-prog.mk | |
| parent | 4c821f0cf512ca5f6aa65113e9302e5982b53b1a (diff) | |
| download | haskell-ac5a314504554ddef0e855ef9e2fcf51e961f4a6.tar.gz | |
Build the stage0 ghc-pkg with Cabal
This solves the problem of how to define MIN_VERSION_base for
the binary package.
Also fixed a couple of build system bugs along the way.
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 0419c3b4ab..400c6208f4 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -186,13 +186,13 @@ ifneq "$$(BINDIST)" "YES" # The quadrupled $'s here are because the _<way>_LIB variables aren't # necessarily set when this part of the makefile is read $1/$2/build/tmp/$$($1_$2_PROG) : \ - $$(foreach dep,$$($1_$2_DEP_NAMES),\ - $$(if $$(filter ghc,$$(dep)),\ + $$(foreach dep,$$($1_$2_DEPS),\ + $$(if $$(filter ghc%,$$(dep)),\ $(if $(filter 0,$3),$$(compiler_stage1_PROGRAM_DEP_LIB),\ $(if $(filter 1,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\ $(if $(filter 2,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\ $$(error Bad build stage)))),\ - $$$$(libraries/$$(dep)_dist-$(if $(filter 0,$3),boot,install)_PROGRAM_DEP_LIB))) + $$$$($$(dep)_dist-$(if $(filter 0,$3),boot,install)_PROGRAM_DEP_LIB))) ifeq "$$($1_$2_LINK_WITH_GCC)" "NO" $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_C_OBJS) $$($1_$2_$$($1_$2_PROGRAM_WAY)_S_OBJS) $$($1_$2_OTHER_OBJS) | $$$$(dir $$$$@)/. |