diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-11 13:41:20 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-14 21:40:58 -0700 |
| commit | 6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c (patch) | |
| tree | c2a14d6f908cf76e4d3b71342dc36d781bc2e40d /rules/build-prog.mk | |
| parent | b92a51f5e235fc22a9ae0d76735b50f095665fb7 (diff) | |
| download | haskell-6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c.tar.gz | |
Rename PACKAGE_KEY and LIB_NAME in build system.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index f09a8c1f6e..52036c6041 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_DEP_LIB_NAMES),\ + $$(foreach dep,$$($1_$2_DEP_COMPONENT_IDS),\ $$(if $$(filter ghc%,$$(dep)),\ $(if $(filter 0,$3),$$(compiler_stage1_PROGRAM_DEP_LIB),\ $(if $(filter 1,$3),$$(compiler_stage2_PROGRAM_DEP_LIB),\ @@ -241,7 +241,7 @@ $1/$2/build/tmp/$$($1_$2_PROG)-wrapper.c: driver/utils/dynwrapper.c | $$$$(dir $ echo '#include <Windows.h>' >> $$@ echo '#include "Rts.h"' >> $$@ echo 'LPTSTR path_dirs[] = {' >> $$@ - $$(foreach p,$$($1_$2_TRANSITIVE_DEP_LIB_NAMES),$$(call make-command,echo ' TEXT("/../lib/$$p")$$(comma)' >> $$@)) + $$(foreach p,$$($1_$2_TRANSITIVE_DEP_COMPONENT_IDS),$$(call make-command,echo ' TEXT("/../lib/$$p")$$(comma)' >> $$@)) echo ' TEXT("/../lib/"),' >> $$@ echo ' NULL};' >> $$@ echo 'LPTSTR progDll = TEXT("../lib/$$($1_$2_PROG).dll");' >> $$@ |