[project @ 2004-10-01 13:42:04 by simonpj]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index b040e58..2cdc7aa 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -192,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)
@@ -232,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)
@@ -410,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
@@ -553,8 +552,6 @@ 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
 
@@ -565,7 +562,7 @@ ifeq "$(BuildPackageGHC)" "YES"
 
 PACKAGE = ghc
 STANDALONE_PACKAGE = YES
-PACKAGE_DEPS = base haskell98
+PACKAGE_DEPS =
 
 endif
 
@@ -585,6 +582,16 @@ MKDEPENDC_SRCS =
 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
 
 # -----------------------------------------------------------------------------