summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-09 13:28:03 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-09 15:39:25 +0000
commit8b115780c45d658019065dafd54d848dc4170db8 (patch)
tree69659ba7d7dd788398d901079359316b03f4d256 /rules
parentf49a1f793143d59afb3f9c9bd2108e12f84d5eb3 (diff)
downloadhaskell-8b115780c45d658019065dafd54d848dc4170db8.tar.gz
Don't pass -dynamic-too to GHC when compiling C files
Diffstat (limited to 'rules')
-rw-r--r--rules/distdir-way-opts.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index b04241d2bf..0d5fdd715d 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -100,7 +100,6 @@ $1_$2_$3_MOST_HC_OPTS = \
$$(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)),$$(if $$(findstring dyn,$3),,-split-objs),) \
- $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),$$(if $$(findstring v,$3),-dynamic-too)) \
$$($1_$2_HC_OPTS) \
$$(CONF_HC_OPTS_STAGE$4) \
$$($1_$2_MORE_HC_OPTS) \
@@ -117,6 +116,7 @@ $1_$2_$3_MOST_HC_OPTS = \
# for a given ($1,$2,$3).
$1_$2_$3_ALL_HC_OPTS = \
$$($1_$2_$3_MOST_HC_OPTS) \
+ $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),$$(if $$(findstring v,$3),-dynamic-too)) \
-odir $1/$2/build -hidir $1/$2/build -stubdir $1/$2/build \
-hisuf $$($3_hisuf) -osuf $$($3_osuf) -hcsuf $$($3_hcsuf)