X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=7f23b5f7ab529d389a43d4eb8b2b13a4afb6ffd0;hb=d68887047bcfb9021151f768fe1a22df2d3fbe1e;hp=3ebdf2a6f96a9750453a1ccd6fe0971b578dea29;hpb=8c0fb915ad2992887562db8163ed53dfd201f2ef;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3ebdf2a..7f23b5f 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.145 2001/03/24 14:58:04 simonmar Exp $
+# $Id: Makefile,v 1.154 2001/04/13 13:37:24 panne Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -23,8 +23,6 @@ else
 HS_PROG=ghc-$(ProjectVersion)
 endif
 
-LINK = ghc
-
 # -----------------------------------------------------------------------------
 # Create compiler configuration
 
@@ -65,12 +63,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@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.
 
@@ -92,13 +85,19 @@ ifeq ($(GhcWithNativeCodeGen),YES)
 DIRS += nativeGen
 else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
+endif
+
 ifeq ($(GhcWithIlx),YES)
 DIRS += ilxGen
 SRC_HC_OPTS += -DILX
 endif
-endif
 
-ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11)
+ifeq "$(BootingFromHc)" "YES"
+# HC files are always from a self-booted compiler
+ghc_411_at_least = 1
+else
+ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
+endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
 ifeq "$(GhcWithInterpreter)" "YES"
@@ -119,7 +118,7 @@ endif
 HCS      = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
 
 ifeq "$(BootingFromHc)" "YES"
-HCS	+= rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hs
+HCS	+= rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc
 endif
 
 HS_OBJS  = \
@@ -137,7 +136,7 @@ C_SRCS += parser/hschooks.c
 # Big Fudge to get around inherent problem that Makefile setup
 # has got with 'mkdependC'.
 # 
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES)
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
@@ -151,8 +150,12 @@ HC=$(GHC)
 #
 # Use GHC for compiling C bits
 #
+ifeq "$(BootingFromHc)" "YES"
+SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+else
 CC = $(HC)
 CC_OPTS := $(addprefix -optc, $(CC_OPTS))
+endif
 
 # magic from GNU make manual to convert a list of values
 # into a colon-separated list
@@ -168,6 +171,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
@@ -214,11 +218,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
@@ -244,9 +259,13 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
+ifneq "$(BootingFromHc)" "YES"
 prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
+endif
 
+ifneq "$(BootingFromHc)" "YES"
 depend :: $(PRIMOP_BITS)
+endif
 
 primop-data-decl.hs-incl: prelude/primops.txt
 	$(GENPOC) --data-decl          < $< > $@
@@ -288,10 +307,10 @@ SRC_LD_OPTS += -no-link-chk
 
 all :: ghc-inplace
 
-ghc-inplace : ghc
+ghc-inplace : $(HS_PROG)
 	@$(RM) $@
 	echo '#!/bin/sh' >>$@
-	echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
+	echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@
 	chmod 755 $@
 
 CLEAN_FILES += ghc-inplace
@@ -303,7 +322,7 @@ CLEAN_FILES += ghc-inplace
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
-INSTALL_PROGS += $(HS_PROG)
+INSTALL_LIBEXECS += $(HS_PROG)
 
 #-----------------------------------------------------------------------------
 # 		clean