# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.181 2001/08/04 06:19:54 ken Exp $
+# $Id: Makefile,v 1.192 2001/10/12 14:27:28 rrt Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
# equivalent of `env' if it doesn't exist locally).
#
ifneq "$(way)" "dll"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
HS_PROG=ghc$(_way)-$(ProjectVersion)
else
+HS_PROG=ghc$(_way)
+endif
+else
HS_PROG=ghc-$(ProjectVersion)
endif
@echo "cGHC_SYSMAN_DIR = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS)
@echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS)
@echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS)
+ifeq ($(GhcWithIlx),YES)
+ @echo "cILX2IL = \"$(ILX2IL)\"" >> $(CONFIG_HS)
+ @echo "cILASM = \"$(ILASM)\"" >> $(CONFIG_HS)
+endif
@echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
@echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
@echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
else
bootstrapped = $(shell if (test $(CANON_HC_VERSION) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi)
compiling_with_4xx = $(shell if (test $(CANON_HC_VERSION) -lt 5000); then echo YES; else echo NO; fi)
+ghc_502_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5020); then echo YES; else echo NO; fi)
endif
# Only include GHCi if we're bootstrapping with at least version 411
endif
endif
+HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
+HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS))
+HS_SRCS += $(CONFIG_HS)
+
# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
# for explanatory comment as to what this does.
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -gt 5000); then echo YES; else echo NO; fi)
+ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5010); then echo YES; else echo NO; fi)
# -----------------------------------------------
-# GHCi calls the C procedure 'system', but alas GHC 4.08's
-# implementation of this (in the library System) didn't work
-# properly on Windows. Everything is fine if you are compiling
-# GHC with GHC 5.01 or better, but lacking that we have the following
+# GHCi calls the C procedure 'rawSystem'; but alas GHC 4.08
+# does not have this. Everything is fine if you are compiling
+# GHC with GHC 5.02 or better, but lacking that we have the following
# hack:
-# copy system.c from lib/std (where it is correct)
-# into main/system.c (where it'll be compiled and
-# linked with the compiler)
+# copy rawSystem.c from hslibs/lang/cbits
+# into main/ (where it'll be compiled and linked with the compiler)
+# (the Haskell-side code is ifdefed into main/SysTools.lhs)
-ifneq "$(ghc_501_at_least)" "YES"
-C_SRCS += main/system.c
+ifneq "$(ghc_502_at_least)" "YES"
+C_SRCS += main/rawSystem.c
SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-HS_OBJS += main/system.o
-
-main/system.c : ../lib/std/cbits/system.c
- $(CP) ../lib/std/cbits/system.c main
+HS_OBJS += main/rawSystem.o
+main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c
+ $(CP) $< main
endif
endif
# End of system hack
# -----------------------------------------------
-HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
-HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS))
-HS_SRCS += $(CONFIG_HS)
-
ifneq "$(BootingFromHc)" "YES"
HS_SRCS += rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs
endif
# Disaster! Then the hc file sees the GHC 5.02 (or whatever)
# include files. For the moment we've reverted to using
# an explicit path in the .hs sources
+#
+# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR
+# when generating dependencies. (=> it gets passed onto mkdependHS,
+# which needs it).
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
ifneq "$(mingw32_TARGET_OS)" "1"
SRC_HC_OPTS += -package concurrent -package posix -package text -package util
SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
SRC_HC_OPTS += -recomp $(GhcHcOpts)
-# TODO: change back to 16M when the strictness analyser is working again.
-SRC_HC_OPTS += -H80M
-# TODO: remove when the strictness analyser is working again.
-rename/ParseIface_HC_OPTS += -H120M
-parser/Parser_HC_OPTS += -H100M
+SRC_HC_OPTS += -H16M
# Special flags for particular modules
# The standard suffix rule for compiling a Haskell file
primop-usage.hs-incl \
primop-primop-info.hs-incl
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += ${GhcCppOpts}
+
ifneq "$(BootingFromHc)" "YES"
prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
endif
# but put it together with the libraries.
# Also don't want any interface files intstalled
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
INSTALL_LIBEXECS += $(HS_PROG)
+else
+INSTALL_PROGS += $(HS_PROG)
+endif
#-----------------------------------------------------------------------------
# clean