[project @ 2001-05-28 03:31:19 by sof]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index d328b7e..ecc6cd6 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.149 2001/03/27 10:32:42 simonmar Exp $
+# $Id: Makefile,v 1.155 2001/05/28 03:31:19 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -57,14 +57,25 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS)
        @echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
        @echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
+ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES"
+       @echo "cCP                   = \"copy /y\"" >> $(CONFIG_HS)
+       @echo "cRM                   = \"del /F /Q\"" >> $(CONFIG_HS)
+       @echo "cTOUCH                = \"$(GHC_TOUCHY)\"" >> $(CONFIG_HS)
+else
        @echo "cCP                   = \"$(CP)\"" >> $(CONFIG_HS)
        @echo "cRM                   = \"$(RM)\"" >> $(CONFIG_HS)
+       @echo "cTOUCH                = \"touch\"" >> $(CONFIG_HS)
+endif
        @echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
        @echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
        @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
        @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
        @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES"
+       @echo "cRAWCPP               = \"$(subst -mwin32,,$(RAWCPP))\"" >> $(CONFIG_HS)
+else
        @echo "cRAWCPP               = \"$(RAWCPP)\"" >> $(CONFIG_HS)
+endif
        @echo done.
 
 CLEAN_FILES += $(CONFIG_HS)
@@ -85,17 +96,18 @@ ifeq ($(GhcWithNativeCodeGen),YES)
 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
@@ -106,6 +118,12 @@ DIRS += ghci
 endif
 endif
 
+# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
+# for explanatory comment as to what this does.
+ifeq "$(MinimalUnixDeps)" "YES"
+SRC_HC_OPTS += -DMINIMAL_UNIX_DEPS
+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)
@@ -170,6 +188,7 @@ ifneq "$(mingw32_TARGET_OS)" "1"
 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
@@ -216,11 +235,22 @@ utils/PrimPacked_HC_OPTS  = -fvia-C -monly-3-regs
 
 # 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
@@ -297,8 +327,13 @@ all :: ghc-inplace
 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 $@
+ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES"
+       @$(RM) $@.bat
+       echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat
+       chmod 755 $@.bat
+endif
 
 CLEAN_FILES += ghc-inplace