# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.168 2001/07/03 16:46:21 rrt Exp $
+# $Id: Makefile,v 1.180 2001/08/02 05:15:33 qrczak Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
@echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
- @echo "cRAWCPP = \"$(GHC_RAWCPP)\"" >> $(CONFIG_HS)
+ @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
@echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
@echo "cMKDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS)
@echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS)
ifeq "$(BootingFromHc)" "YES"
# HC files are always from a self-booted compiler
-ghc_411_at_least = YES
+bootstrapped = YES
+compiling_with_4xx=NO
else
-ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi)
+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)
endif
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(ghc_411_at_least)" "YES"
+ifeq "$(bootstrapped)" "YES"
SRC_HC_OPTS += -DGHCI
DIRS += ghci
endif
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -gt 5000); 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
+# 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)
+
ifneq "$(ghc_501_at_least)" "YES"
-boot ::
- $(CP) ../lib/std/cbits/system.c main
-# Build GHC 5.xx's version of systemCmd, so that even when bootstrapping with 4.08, we
-# can assume that system works properly on Win32
C_SRCS += main/system.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
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))
# Big Fudge to get around inherent problem that Makefile setup
# has got with 'mkdependC'.
#
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
# -----------------------------------------------------------------------------
# Haskell compilations
-I. -IcodeGen -InativeGen -Iparser \
-i$(subst $(space),:,$(DIRS))
-# We should do this, to avoid the use of an explicit path
-# in GHC source files (include "../includes/config.h"
+# Omitted: -I$(GHC_INCLUDE_DIR)
+# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
+# to avoid the use of an explicit path in GHC source files
+# (include "../includes/config.h"
# But alas GHC 4.08 (and others for all I know) uses this very
# same include path when compiling the .hc files it generates.
# 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
-# -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)
-SRC_HC_OPTS += -H16m
+# 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
# Special flags for particular modules
# The standard suffix rule for compiling a Haskell file
# The latest GHC version doesn't have a -K option yet, and it doesn't
# seem to be necessary anymore for the modules below.
-ifeq "$(ghc_411_at_least)" "NO"
+ifeq "$(compiling_with_4xx)" "YES"
rename/ParseIface_HC_OPTS += -K2m
parser/Parser_HC_OPTS += -K2m
endif
# Generate supporting stuff for prelude/PrimOp.lhs
# from prelude/primops.txt
+# Run prelude/primops.txt through the preprocessor, to weed out
+# primitives that don't (need to) exist on 64-bit architectures.
+prelude/primops.i: prelude/primops.txt
+ $(CPP) -I$(GHC_INCLUDE_DIR) -x c $< 2>/dev/null | $(SED) -e '/^#/d' > $@
+
GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
PRIMOP_BITS=primop-data-decl.hs-incl \
depend :: $(PRIMOP_BITS)
endif
-primop-data-decl.hs-incl: prelude/primops.txt
+primop-data-decl.hs-incl: prelude/primops.i
$(GENPOC) --data-decl < $< > $@
-primop-tag.hs-incl: prelude/primops.txt
+primop-tag.hs-incl: prelude/primops.i
$(GENPOC) --primop-tag < $< > $@
-primop-list.hs-incl: prelude/primops.txt
+primop-list.hs-incl: prelude/primops.i
$(GENPOC) --primop-list < $< > $@
-primop-has-side-effects.hs-incl: prelude/primops.txt
+primop-has-side-effects.hs-incl: prelude/primops.i
$(GENPOC) --has-side-effects < $< > $@
-primop-out-of-line.hs-incl: prelude/primops.txt
+primop-out-of-line.hs-incl: prelude/primops.i
$(GENPOC) --out-of-line < $< > $@
-primop-commutable.hs-incl: prelude/primops.txt
+primop-commutable.hs-incl: prelude/primops.i
$(GENPOC) --commutable < $< > $@
-primop-needs-wrapper.hs-incl: prelude/primops.txt
+primop-needs-wrapper.hs-incl: prelude/primops.i
$(GENPOC) --needs-wrapper < $< > $@
-primop-can-fail.hs-incl: prelude/primops.txt
+primop-can-fail.hs-incl: prelude/primops.i
$(GENPOC) --can-fail < $< > $@
-primop-strictness.hs-incl: prelude/primops.txt
+primop-strictness.hs-incl: prelude/primops.i
$(GENPOC) --strictness < $< > $@
-primop-usage.hs-incl: prelude/primops.txt
+primop-usage.hs-incl: prelude/primops.i
$(GENPOC) --usage < $< > $@
-primop-primop-info.hs-incl: prelude/primops.txt
+primop-primop-info.hs-incl: prelude/primops.i
$(GENPOC) --primop-primop-info < $< > $@
chmod 755 $@
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@$(RM) $@.bat
- echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat
+ echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %1 %2 %3 %4 %5 %6 %7 %8 %9" >$@.bat
chmod 755 $@.bat
endif