X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=2cdc7aab5e861eeece6e351bc9210604e12899e0;hb=dcf58a64367700d80dc7609b1b55ff6a8e8b97ee;hp=ec9eb414b0cde1ccb446f1a01810698039c84483;hpb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index ec9eb41..2cdc7aa 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -159,6 +159,7 @@ endif
 # be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the
 # equivalent of `env' if it doesn't exist locally).
 #
+ifneq "$(BuildPackageGHC)" "YES"
 ifneq "$(way)" "dll"
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
@@ -168,6 +169,7 @@ endif
 else
 HS_PROG=$(odir)/ghc-$(ProjectVersion)
 endif
+endif
 
 # -----------------------------------------------------------------------------
 # Create compiler configuration
@@ -190,6 +192,8 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
 	@echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
 	@echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
+	@echo "cTARGETOS             = \"$(TargetOS_CPP)\"" >> $(CONFIG_HS)
+	@echo "cTARGETARCH           = \"$(TargetArch_CPP)\"" >> $(CONFIG_HS)
 	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
 	@echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
 	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@@ -230,8 +234,8 @@ CLEAN_FILES += $(CONFIG_HS)
 
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
-  specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser cprAnalysis compMan ndpFlatten cbits iface
+  specialise simplCore stranal stgSyn simplStg codeGen main \
+  profiling parser cprAnalysis compMan ndpFlatten cbits iface cmm
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -271,8 +275,8 @@ endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
-# Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package haskell-src
+# Yes, include the interpreter, readline, and Template Haskell extensions
+SRC_HC_OPTS += -DGHCI -package template-haskell
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SRC_HC_OPTS += -package unix
 ifeq "$(GhcLibsWithReadline)" "YES"
@@ -285,9 +289,6 @@ else
 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)
-
 # -----------------------------------------------
 # mkdependC stuff
 #
@@ -304,7 +305,7 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 # 		Haskell compilations
 
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -Rghc-timing \
+  -cpp -fglasgow-exts -fno-generics -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser
 
 # Omitted: 	-I$(GHC_INCLUDE_DIR)
@@ -411,9 +412,6 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS		+= '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
-# Required due to use of Concurrent.myThreadId
-utils/Panic_HC_OPTS += -fvia-C
-
 parser/Lexer_HC_OPTS += -funbox-strict-fields
 
 # ghc_strlen percolates through so many modules that it is easier to get its
@@ -554,12 +552,21 @@ endif
 # typecheck/TcTyDecls_HC_OPTS += -auto-all
 # typecheck/TcType_HC_OPTS += -auto-all
 # typecheck/TcUnify_HC_OPTS += -auto-all
-# 
-# absCSyn/PprAbsC_HC_OPTS += -auto-all
 
 coreSyn/CorePrep_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
+# Building GHC package
+
+ifeq "$(BuildPackageGHC)" "YES"
+
+PACKAGE = ghc
+STANDALONE_PACKAGE = YES
+PACKAGE_DEPS =
+
+endif
+
+#-----------------------------------------------------------------------------
 # 		clean
 
 MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
@@ -573,6 +580,17 @@ MKDEPENDC_SRCS =
 
 # Make doesn't work this out for itself, it seems
 parser/Parser.y : parser/Parser.y.pp
+EXTRA_SRCS += parser/Parser.y
+
+
+#-----------------------------------------------------------------------------
+# 		Source files for tags file generation
+#
+# We want to excluded derived sources, because they won't be in the source
+# tree, which is where we are going to move the TAGS file to.a
+
+TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
+
 
 include $(TOP)/mk/target.mk