diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-20 16:32:56 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-23 10:59:10 -0700 |
| commit | 73a6265e040fdbb2c9e75337663aa6879e20e233 (patch) | |
| tree | fa43d2be5706fd8cb276aa6e4be999da12d8766d /rules/build-prog.mk | |
| parent | c0847967caf51ea4ca88d0ffc25fe1bd99dcabed (diff) | |
| download | haskell-73a6265e040fdbb2c9e75337663aa6879e20e233.tar.gz | |
Make $1 in $1_$2_$3_FOO actually be directory.
Summary:
Previously, we used $1_$2_PACKAGE_KEY to parametrize $1. But the
documentation says that $1 should be the directory... and we're now
putting the libraries in $1_$2_LIB_NAME. So use /that/. This is just
alpha-renaming, so as long as we're consistent, there's no material
difference.)
I also fixed a bug of a package ID calculation which I missed first
time around, which was tickled by this change.
BTW, this means DEP_KEYS and TRANSITIVE_DEP_KEYS are unused, so
remove them from ghc-cabal.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: austin
Subscribers: thomie, bgamari
Differential Revision: https://phabricator.haskell.org/D1010
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index eca3358e25..1029fdd3ea 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -189,7 +189,7 @@ 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) $1/$2/build/tmp/$$($1_$2_PROG).dll : \ - $$(foreach dep,$$($1_$2_DEPS),\ + $$(foreach dep,$$($1_$2_DEP_LIB_NAMES),\ $$(if $$(filter ghc%,$$(dep)),\ $(if $(filter 0,$3),$$(compiler_stage1_PROGRAM_DEP_LIB),\ $(if $(filter 1,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\ |