X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=305399a6f124f765ccb71f033953e8cd2f73e40d;hb=73ac2f44193dcfe4cc56aab5b2910cf4edc24a18;hp=38395465ef0de57897f460932dd0869ed669fa02;hpb=1fb39ac3825e3db3824eed5e2359a676f260cbd3;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3839546..305399a 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.211 2002/02/13 20:14:42 sof Exp $
+# $Id: Makefile,v 1.224 2002/10/09 15:03:48 simonpj Exp $
 
 TOP = ..
 
@@ -11,6 +11,10 @@ endif
 
 include $(TOP)/mk/boilerplate.mk
 
+USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS))
+count :
+	./count_lines $(USER_SRCS)
+
 #-----------------------------------------------------------------------------
 # Building ghc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
@@ -102,6 +106,9 @@ ALL_DIRS = \
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
 
+# HsGeneric.hs is not used just now
+EXCLUDED_SRCS += hsSyn/HsGeneric.hs
+
 ifeq ($(GhcWithNativeCodeGen),YES)
 ALL_DIRS += nativeGen
 else
@@ -125,48 +132,25 @@ compiling_with_4xx=NO
 else
 bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
 compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
-ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
-ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -DGHCI
-ALL_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 "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi)
+ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
+# Yes, include the interepreter, readline, and Template Haskell extensions
+SRC_HC_OPTS += -DGHCI -package haskell-src
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SRC_HC_OPTS += -package unix -package readline 
 endif
+ALL_DIRS += ghci
+else
+# No interpreter, so exclude Template Haskell modules
+EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
+endif 
 
 # There are some C files to include in HS_PROG, so add these to HS_OBJS
 HS_OBJS	 += $(C_OBJS)
 
 # -----------------------------------------------
-# system hack.
-#
-# 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 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)
-
-ifeq "$(bootstrapped)/$(ghc_502_at_least)" "NO/NO"
-SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-ALL_SRCS += main/rawSystem.c
-main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c
-	$(CP) $< main/
-else
-EXCLUDED_SRCS = main/rawSystem.c
-endif
-
-# -----------------------------------------------
 # mkdependC stuff
 #
 # Big Fudge to get around inherent problem that Makefile setup
@@ -191,7 +175,7 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(ALL_DIRS)) 
+  $(patsubst %, -i%, $(ALL_DIRS))
 
 # Omitted: 	-I$(GHC_INCLUDE_DIR)
 # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, 
@@ -208,11 +192,15 @@ SRC_HC_OPTS += \
 # which needs it).
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
-ifneq "$(mingw32_TARGET_OS)" "1"
+# When bootstrapped, we don't make use of *any* packages
+# (except possibly readline if GHCi is enabled, see above)
+ifneq "$(bootstrapped)" "YES"
+ifneq "$(mingw32_HOST_OS)" "1"
 SRC_HC_OPTS += -package concurrent -package posix -package util
 else
 SRC_HC_OPTS += -package concurrent -package util
 endif
+endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 SRC_HC_OPTS += -recomp $(GhcHcOpts)
@@ -237,30 +225,24 @@ prelude/PrelRules_HC_OPTS	= -fvia-C
 main/ParsePkgConf_HC_OPTS	+= -fno-warn-incomplete-patterns
 # Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?)
 # primops on all platforms.
-rename/ParseIface_HC_OPTS 	+= -Onot -H45m -fno-warn-incomplete-patterns -fvia-C
 parser/Parser_HC_OPTS 		+= -Onot -fno-warn-incomplete-patterns -fvia-C
 
 # 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 "$(compiling_with_4xx)" "YES"
-rename/ParseIface_HC_OPTS 	+= -K2m
 parser/Parser_HC_OPTS 		+= -K2m
 endif
 
-ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
+ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
 endif
 
 utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 
-# flags for PrimPacked:
-#
-# -monly-3-regs 
-#	because it contains a 'ccall strlen', which gets inlined by
-# 	gcc, causing a lack of registers.
-#
-utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs
+ifeq "$(bootstrapped)" "YES"
+utils/Binary_HC_OPTS		= -funbox-strict-fields
+endif
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS	= -fvia-C
@@ -284,10 +266,14 @@ main/SysTools_HC_OPTS		= -fno-cse
 # The #include is vital for the via-C route, else the C
 # compiler doesn't realise that the stcall foreign imports are indeed
 # stdcall, and doesn't generate the Foo@8 name for them
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS		+= '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
+# ghc_strlen percolates through so many modules that it is easier to get its
+# prototype via a global option instead of a myriad of per-file OPTIONS
+SRC_HC_OPTS += '-\#include "hschooks.h"'
+
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt
@@ -377,17 +363,30 @@ CLEAN_FILES += ghc-inplace
 
 DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_LIBEXECS += $(HS_PROG)
 else
 INSTALL_PROGS += $(HS_PROG)
 endif
 
+# ----------------------------------------------------------------------------
+# profiling.
+
+# rename/Rename_HC_OPTS += -auto-all
+# rename/RnEnv_HC_OPTS += -auto-all
+# rename/RnHiFiles_HC_OPTS += -auto-all
+# rename/RnIfaces_HC_OPTS += -auto-all
+# rename/RnSource_HC_OPTS += -auto-all
+# rename/RnBinds_HC_OPTS += -auto-all
+# rename/RnExpr_HC_OPTS += -auto-all
+# rename/RnHsSyn_HC_OPTS += -auto-all
+# rename/RnNames_HC_OPTS += -auto-all
+# rename/RnTypes_HC_OPTS += -auto-all
+
 #-----------------------------------------------------------------------------
 # 		clean
 
-MAINTAINER_CLEAN_FILES += \
-	parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info
+MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
 
 #-----------------------------------------------------------------------------
 # 		Include target-rule boilerplate