From ee15d1ff4c4dd05b05e388cfbcfda60986db81de Mon Sep 17 00:00:00 2001 From: simonmar Date: Fri, 1 Dec 2000 21:53:59 +0000 Subject: [PATCH 1/1] [project @ 2000-12-01 21:53:59 by simonmar] build cbits libraries correctly for GHCi. --- mk/target.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mk/target.mk b/mk/target.mk index d11fbff..8f603d8 100644 --- 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 -- 1.7.10.4