diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2015-11-01 12:25:39 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-01 13:42:49 +0100 |
| commit | 5a4818039ff4419372744b395e6fc904b4bd9a1d (patch) | |
| tree | 16627b1e247b42b6a6520328015b56884e6bb809 /compiler/ghc.mk | |
| parent | f16827f84855bef94b1b69f49bd1734627946f02 (diff) | |
| download | haskell-5a4818039ff4419372744b395e6fc904b4bd9a1d.tar.gz | |
keepCAFsForGHCi was broken
Buggy Makefile code meant it was always included, instead of being
included only for the dyn ways.
Test Plan: validate
Reviewers: hvr, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1400
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 26e22b4840..e3ea52acec 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -664,8 +664,8 @@ $(eval $(call build-package,compiler,stage3,2)) define keepCAFsForGHCiDynOnly # $1 = stage # $2 = way -ifeq "$$(findstring dyn, $1)" "" -compiler_stage$1_$2_C_OBJS := $$(filter-out %/keepCAFsForGHCi.o,$$(compiler_stage$1_$2_C_OBJS)) +ifeq "$$(findstring dyn, $2)" "" +compiler_stage$1_$2_C_OBJS := $$(filter-out %/keepCAFsForGHCi.$$($2_osuf),$$(compiler_stage$1_$2_C_OBJS)) endif endef $(foreach w,$(compiler_stage1_WAYS),$(eval $(call keepCAFsForGHCiDynOnly,1,$w))) |