[project @ 2000-12-01 21:53:59 by simonmar]

build cbits libraries correctly for GHCi.

diff --git a/mk/target.mk b/mk/target.mk
index d11fbff..8f603d8 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -414,10 +414,15 @@ ifeq "$(GHCI_LIBOBJS)" ""
 GHCI_LIBOBJS = $(LIBOBJS)
 endif
 
+ifneq "$(HS_SRCS)" ""
 ifeq "$(SplitObjs)" "YES"
 $(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
        ( echo $(STUBOBJS) ; $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' -print ) | xargs ld -r -x -o $@
-else
+else # not SplitObjs
+$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
+       ld -r -x -o $@ $(GHCI_LIBOBJS)
+endif
+else # no HS_SRCS
 $(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
        ld -r -x -o $@ $(GHCI_LIBOBJS)
 endif