[commit: ghc] master: keepCAFsForGHCi was broken (5a48180)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5a4818039ff4419372744b395e6fc904b4bd9a1d/ghc

>---------------------------------------------------------------

commit 5a4818039ff4419372744b395e6fc904b4bd9a1d
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Nov 1 12:25:39 2015 +0100

    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


>---------------------------------------------------------------

5a4818039ff4419372744b395e6fc904b4bd9a1d
 compiler/ghc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 26e22b4..e3ea52a 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)))