[project @ 2001-07-25 12:18:26 by simonmar]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 68f0255..86489ed 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -25,24 +25,21 @@ endif
 
 HC = $(GHC_INPLACE)
 
-ifneq "$(DLLized)" "YES"
-PACKAGE = -package-name std
-else
+# *** THIS WON'T WORK ANY MORE *** (PACKAGE is now set in fptools/mk/target.mk)
+ifeq "$(DLLized)" "YES"
 # Hack by SPJ to delay if-then-else until the pattern rule when we have $*
 PACKAGE = $(subst ~, ,$(word $(words dummy $(findstring $(notdir $*), PrelMain )), -package-name~std))
 endif
 
-HSLIB = std
+PACKAGE = std
 
 BOOT_SRCS += PrelPrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(ILXized)" "YES"
+SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts)
 SRC_HSC2HS_OPTS += -Icbits
-endif
 
 ifdef USE_REPORT_PRELUDE
 SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
@@ -103,6 +100,7 @@ CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 # The procedure differs from that in fptools/mk/target.mk in two ways:
 #  (a) we don't want PrelMain in the GHCi std library
 #  (b) on Win32 we must split it into two, because a single .o file can't
+#      have more than 65536 relocations in it.
 #      
 
 # we don't want PrelMain in the GHCi library.
@@ -120,7 +118,7 @@ else
 HSstd.o :: $(GHCI_LIBOBJS)
        ld -r -x -o HSstd1.o $(filter     Prel%, $(GHCI_LIBOBJS))
        ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))
-endif # TARGETPLATFORM = win32
+endif # TARGETPLATFORM = i386-unknown-mingw32
 
 
 
@@ -152,8 +150,6 @@ INSTALL_DATAS += PrelGHC.$(way_)hi
 
 
 ilxstd:
-       (cd //c/devel/fcom/src; make ilxsdk)
-       (cd ../../compiler; make)
        $(MAKE) way=ilx-Onot-mono std.ilx-Onot.mono.dll std.ilx-Onot.mono.vlb
        $(MAKE) way=ilx-O-mono  std.ilx-O.mono.dll std.ilx-O.mono.vlb
        $(MAKE) way=ilx-Onot-generic std.ilx-Onot.generic.dll
@@ -221,3 +217,7 @@ endif # ILXized
 
 include $(TOP)/mk/target.mk
 
+# PrelIO.hsc includes PrelHandle_hsc.h
+PrelIO.hsc : PrelHandle_hsc.h
+
+