[project @ 2001-09-26 13:42:50 by chak]

[ghc-hetmet.git] / mk / target.mk

diff --git a/mk/target.mk b/mk/target.mk
index 4d216fc..be37c93 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -350,8 +350,12 @@ C_SRCS += $(wildcard ../*_hsc.c)
 SRC_CC_OPTS += -I.. -I.
 endif
 
+ifneq "$(way)" "i"
 LIBRARY      = libHS$(PACKAGE)$(_cbits)$(_way).a
 GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o
+else
+LIBRARY      = $(PACKAGE).dll
+endif
 
 ifneq "$(IS_CBITS_LIB)" "YES"
 WAYS=$(GhcLibWays)
@@ -389,11 +393,18 @@ endif # PACKAGE
 ifneq "$(LIBRARY)" ""
 all :: $(LIBRARY)
 
+ifneq "$(way)" "i"
 define BUILD_LIB
 $(RM) $@
 $(AR) $(AR_OPTS) $@ $(STUBOBJS) $(LIBOBJS)
 $(RANLIB) $@
 endef
+else
+define BUILD_LIB
+$(RM) $@
+al -out:$@ $(STUBOBJS) $(LIBOBJS)
+endef
+endif
 
 #
 # For Haskell object files, we might have chosen to split
@@ -433,7 +444,7 @@ HC_SPLIT_PRE = \
     $(RM) $@; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \
     $(FIND) $(basename $@) -name '*.$(way_)o' | xargs $(RM) __rm_food; fi
 ifeq "$(GhcWithInterpreter)" "YES"
-HC_SPLIT_POST = ld -r -x -o $@ $(basename $@)/*.$(way_)o
+HC_SPLIT_POST = $(LD) -r -x -o $@ $(basename $@)/*.$(way_)o
 else
 HC_SPLIT_POST = touch $@
 endif # GhcWithInterpreter == YES
@@ -463,12 +474,12 @@ ifeq "$(StripLibraries)" "YES"
 ifeq "$(SplitObjs)" "YES"
 SRC_HC_POST_OPTS += \
   for i in $(basename $@)/*; do \
-       ld -r -x -o $$i.tmp $$i; \
+       $(LD) -r -x -o $$i.tmp $$i; \
        $(MV) $$i.tmp $$i; \
   done
 else
 SRC_HC_POST_OPTS += \
-  ld -r -x -o $@.tmp $@; $(MV) $@.tmp $@
+  $(LD) -r -x -o $@.tmp $@; $(MV) $@.tmp $@
 endif # SplitObjs
 endif # StripLibraries
 
@@ -504,21 +515,18 @@ CLEAN_FILES += $(GHCI_LIBRARY)
 
 all :: $(GHCI_LIBRARY)
 
-ifneq "$(GHCI_LIBRARY)" "HSstd.o"
-# An annoying gotcha is that the Prelude is a bit special,
-# for reasons described in ghc/lib/std/Makefile.
-# So we only put in this standard rule for packages other than std
-# The rule for the Prelude is in ghc/lib/std/Makefile
-# We check for GHCI_LIBRARY being HSstd.o rather than
-# PACKAGE being std, because we want to still use the boilerplate rule 
-# for cbits.
+ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
+# If you don't want to build GHCI_LIBRARY the 'standard' way,
+# set DONT_WANT_STD_GHCI_LIB_RULE to YES. The Prelude and
+# hslibs/Win32 uses this 'feature'.
+#
 $(GHCI_LIBRARY) :: $(LIBOBJS)
-       ld -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
-endif
+       $(LD) -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
 
+endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
 endif # way
-endif # GHCI_LIBRARY
+endif # GHCI_LIBRARY != ""
 
 
 #----------------------------------------