X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fdistdir-way-opts.mk;h=fc805979e82f42223772ddf641a75084c36b8e85;hb=754e039a8a15d5774fe73872ff9ac593b46370e0;hp=dea172733ca37692dfab1d9d3a6a74d745255f93;hpb=02416f002b7f78c3842a622f53e1ed0aa143a337;p=ghc-hetmet.git

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index dea1727..fc80597 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -13,7 +13,7 @@
 
 # Set compilation flags that additionally depend on a particular way
 
-define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way
+define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
 
 # Options for a Haskell compilation:
 #   - CONF_HC_OPTS                 source-tree-wide options, selected at
@@ -46,7 +46,7 @@ $1_$2_$3_MOST_HC_OPTS = \
  $$(foreach opt,$$($1_$2_CPP_OPTS),-optP$$(opt)) \
  $$(if $$($1_PACKAGE),-optP-include -optP$1/$2/build/autogen/cabal_macros.h) \
  $$(foreach pkg,$$($1_$2_DEPS),-package $$(pkg)) \
- $$(if $$(findstring YES,$$($1_$2_SplitObjs)),-split-objs,) \
+ $$(if $$(findstring YES,$$($1_$2_SplitObjs)),$$(if $$(findstring dyn,$3),,-split-objs),) \
  $$($1_$2_HC_OPTS) \
  $$($1_$2_EXTRA_HC_OPTS) \
  $$($1_$2_$3_HC_OPTS) \
@@ -59,7 +59,7 @@ $1_$2_$3_ALL_HC_OPTS = \
  -odir $1/$2/build -hidir $1/$2/build -stubdir $1/$2/build \
  -hisuf $$($3_hisuf) -osuf  $$($3_osuf) -hcsuf $$($3_hcsuf)
 
-ifeq "$3" "0"
+ifeq "$4" "0"
 # This is a bit of a hack.
 # If we are compiling something with the bootstrapping compiler on
 # cygwin, and it uses an include file from the rts (say), then we