From baf4a0612e370ebe0f397c27024feb8ced23e08a Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 11 Jan 2005 14:14:48 +0000 Subject: [PATCH] [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. --- mk/target.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mk/target.mk b/mk/target.mk index 51b5d98..8aac7d3 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): -- 1.7.10.4