summaryrefslogtreecommitdiff
path: root/mk/target.mk
diff options
context:
space:
mode:
authorsimonmar <unknown>2005-01-11 14:14:48 +0000
committersimonmar <unknown>2005-01-11 14:14:48 +0000
commitbaf4a0612e370ebe0f397c27024feb8ced23e08a (patch)
tree272dacc02aa66cad46da7e4c0fb71dea3d818529 /mk/target.mk
parentc6d90de6e5236d32df49609bb9179b0108033c86 (diff)
downloadhaskell-baf4a0612e370ebe0f397c27024feb8ced23e08a.tar.gz
[project @ 2005-01-11 14:14:48 by simonmar]
When way=u, turn off split objects by setting SplitObjs=NO, rather than testing for way=u directly. Fixes a build wibble.
Diffstat (limited to 'mk/target.mk')
-rw-r--r--mk/target.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/target.mk b/mk/target.mk
index 51b5d98ad2..8aac7d30c5 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -288,12 +288,14 @@ endif
# whether HS_SRCS is empty or not.
#
+# can't split objs in way 'u', so we disable it here
+ifeq "$(way)" "u"
+SplitObjs = NO
+endif
+
ifneq "$(HS_SRCS)" ""
ifeq "$(SplitObjs)" "YES"
-# can't split objs in way 'u', so we disable it here
-ifneq "$(way)" "u"
-
SRC_HC_OPTS += -split-objs
# We generate the archive into a temporary file libfoo.a.tmp, then
@@ -316,7 +318,6 @@ $(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
$(RM) $@.list
$(RANLIB) $@
endef
-endif
# Extra stuff for compiling Haskell files with $(SplitObjs):