# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.148 2001/03/27 09:38:02 simonmar Exp $
+# $Id: Makefile,v 1.154 2001/04/13 13:37:24 panne Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
@echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
@echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
- @echo "clibdir = \"$(libdir)\"" >> $(CONFIG_HS)
- @echo "clibexecdir = \"$(libexecdir)\"" >> $(CONFIG_HS)
- @echo "cdatadir = \"$(datadir)\"" >> $(CONFIG_HS)
- @echo "cbindir = \"$(bindir)\"" >> $(CONFIG_HS)
@echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
- @echo "cFPTOOLS_TOP_ABS = \"$(FPTOOLS_TOP_ABS)\"" >> $(CONFIG_HS)
@echo "cRAWCPP = \"$(RAWCPP)\"" >> $(CONFIG_HS)
@echo done.
DIRS += nativeGen
else
SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
+endif
+
ifeq ($(GhcWithIlx),YES)
DIRS += ilxGen
SRC_HC_OPTS += -DILX
endif
-endif
ifeq "$(BootingFromHc)" "YES"
# HC files are always from a self-booted compiler
ghc_411_at_least = 1
else
-ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11)
+ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
endif
# Only include GHCi if we're bootstrapping with at least version 411
SRC_HC_OPTS += -package concurrent -package posix -package text -package util
else
SRC_HC_OPTS += -package concurrent -package text -package util
+main/TmpFiles_HC_OPTS += -Dmingw32_TARGET_OS
endif
SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
# ByteCodeItbls uses primops that the NCG doesn't support yet.
ghci/ByteCodeItbls_HC_OPTS = -fvia-C
-
-# CSE interacts badly with the top-level IORefs in DriverState, causing some
-# of them to be commoned up. We have a fix for this in 5.00+, but earlier
-# versions of the compiler will need CSE turned off on this module.
+ghci/ByteCodeLink_HC_OPTS = -fvia-C
+
+# CSE interacts badly with top-level IORefs (reportedly in DriverState and
+# DriverMkDepend), causing some of them to be commoned up. We have a fix for
+# this in 5.00+, but earlier versions of the compiler will need CSE turned off.
+# To be on the safe side, we disable CSE in *all* modules with top-level IORefs.
+compMan/CompManager_HC_OPTS = -fno-cse
+ghci/InteractiveUI_HC_OPTS = -fno-cse
+main/CmdLineOpts_HC_OPTS = -fno-cse
+main/DriverFlags_HC_OPTS = -fno-cse
+main/DriverMkDepend_HC_OPTS = -fno-cse
+main/DriverPipeline_HC_OPTS = -fno-cse
main/DriverState_HC_OPTS = -fno-cse
+main/DriverUtil_HC_OPTS = -fno-cse
+main/Finder_HC_OPTS = -fno-cse
+main/TmpFiles_HC_OPTS = -fno-cse
# ----------------------------------------------------------------------------
# C compilations
ghc-inplace : $(HS_PROG)
@$(RM) $@
echo '#!/bin/sh' >>$@
- echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
+ echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
chmod 755 $@
CLEAN_FILES += ghc-inplace