projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-08-04 06:19:54 by ken]
[ghc-hetmet.git]
/
ghc
/
lib
/
std
/
Makefile
diff --git
a/ghc/lib/std/Makefile
b/ghc/lib/std/Makefile
index
b8815d5
..
3086179
100644
(file)
--- a/
ghc/lib/std/Makefile
+++ b/
ghc/lib/std/Makefile
@@
-25,24
+25,21
@@
endif
HC = $(GHC_INPLACE)
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
# 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
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
SRC_HSC2HS_OPTS += -Icbits
-endif
ifdef USE_REPORT_PRELUDE
SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
ifdef USE_REPORT_PRELUDE
SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
@@
-57,10
+54,15
@@
PrelHandle_HC_OPTS += -fno-ignore-asserts
PrelIO_HC_OPTS += -fno-ignore-asserts
# Special options
PrelIO_HC_OPTS += -fno-ignore-asserts
# Special options
-PrelStorable_HC_OPTS = -monly-3-regs
+# TODO: remove -H80M when the strictness analyser is working again.
+PrelStorable_HC_OPTS = -monly-3-regs -H80M
PrelCError_HC_OPTS = +RTS -K4m -RTS
PrelCError_HC_OPTS = +RTS -K4m -RTS
-PrelInt_HC_OPTS = -monly-3-regs
-PrelWord_HC_OPTS = -monly-3-regs
+PrelInt_HC_OPTS = -H80M # -monly-3-regs
+PrelWord_HC_OPTS = -H80M # -monly-3-regs
+PrelFloat_HC_OPTS = -H80M
+PrelRead_HC_OPTS = -H80M
+PrelHandle_HC_OPTS = -H80M
+Time_HC_OPTS = -H80M
#-----------------------------------------------------------------------------
# Dependency generation
#-----------------------------------------------------------------------------
# Dependency generation
@@
-71,9
+73,8
@@
SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
# Rules
PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
# Rules
PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
- rm -f PrelPrimopWrappers.hs
- ../../utils/genprimopcode/genprimopcode --make-haskell-wrappers \
- < ../../compiler/prelude/primops.txt > PrelPrimopWrappers.hs
+ rm -f $@
+ ../../utils/genprimopcode/genprimopcode --make-haskell-wrappers < $< > $@
PrelGHC.$(way_)hi : PrelGHC.hi-boot
cp $< $@
PrelGHC.$(way_)hi : PrelGHC.hi-boot
cp $< $@
@@
-94,7
+95,7
@@
HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
all :: PrelMain.dll_o
endif
all :: PrelMain.dll_o
endif
-CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
@@
-103,6
+104,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
# 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.
#
# we don't want PrelMain in the GHCi library.
@@
-111,7
+113,7
@@
GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# Standard rule
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
# Standard rule
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
+HSstd.o :: $(GHCI_LIBOBJS)
ld -r -x -o $@ $(GHCI_LIBOBJS)
else
ld -r -x -o $@ $(GHCI_LIBOBJS)
else
@@
-120,7
+122,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))
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
+154,6
@@
INSTALL_DATAS += PrelGHC.$(way_)hi
ilxstd:
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
$(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
+221,7
@@
endif # ILXized
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk
+# PrelIO.hsc includes PrelHandle_hsc.h
+PrelIO.hsc : PrelHandle_hsc.h
+
+