[project @ 2005-02-25 13:06:31 by simonpj]
[ghc-hetmet.git] / ghc / compiler / Makefile
index 41cc372..bc3ab8a 100644 (file)
@@ -19,9 +19,7 @@ TOP = ..
 
 # Use GHC for compiling C bits (NB. must be before boilerplate include)
 #
-ifneq "$(BootingFromHc)" "YES"
 UseGhcForCc = YES
-endif
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -88,6 +86,10 @@ WAYS=$(GhcCompilerWays)
 #  - create a link tree.  The problem with requiring link trees is that 
 #    Windows doesn't support symbolic links.
 
+ifeq "$(stage)" ""
+stage=1
+endif
+
 boot ::
        $(MKDIRHIER) stage$(stage)
        for i in $(ALL_DIRS); do \
@@ -102,17 +104,18 @@ boot ::
 # PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz'
 #     whereas 'cp foo baz' treats the two paths independently.
 #     Hence the "../.." in the ln command line
+ifeq "$(stage)" "1"
+ifeq "$(ghc_ge_603)" "NO"
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
        for i in */*hi-boot*; do \
+           cp -u -f $$i stage$(stage)/$$i; \
        done
 else
        for i in */*hi-boot*; do \
-           $(LN_S) -f ../../$$i stage$(stage)/$$i; \
+           $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
        done
 endif
-
-ifeq "$(stage)" ""
-stage=1
+endif
 endif
 
 ifeq "$(stage)" "1"
@@ -160,6 +163,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)
@@ -169,6 +173,7 @@ endif
 else
 HS_PROG=$(odir)/ghc-$(ProjectVersion)
 endif
+endif
 
 # -----------------------------------------------------------------------------
 # Create compiler configuration
@@ -181,7 +186,7 @@ boot :: $(CONFIG_HS)
 
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @$(RM) -f $(CONFIG_HS)
-       @echo -n "Creating $(CONFIG_HS) ... "
+       @echo "Creating $(CONFIG_HS) ... "
        @echo "module Config where" >>$(CONFIG_HS)
        @echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
        @echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@@ -189,8 +194,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @echo "cProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS)
        @echo "cBooterVersion        = \"$(GhcVersion)\"" >> $(CONFIG_HS)
        @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
-       @echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
-       @echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
        @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
        @echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
        @echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@@ -217,7 +220,6 @@ ifeq ($(GhcWithIlx),YES)
 endif
        @echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
        @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)
@@ -226,14 +228,120 @@ endif
 CLEAN_FILES += $(CONFIG_HS)
 
 # -----------------------------------------------------------------------------
+# Create platform includes
+
+# Here we generate a little header file containing CPP symbols that GHC
+# uses to determine which platform it is building on/for.  The platforms
+# can differ between stage1 and stage2 if we're cross-compiling, so we
+# need one of these header files per stage.
+
+PLATFORM_H = ghc_boot_platform.h
+
+stage1/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk Makefile
+       @echo "Creating $@..."
+       @$(RM) $@
+       @echo "#ifndef __PLATFORM_H__"  >$@
+       @echo "#define __PLATFORM_H__" >>$@
+       @echo >> $@
+       @echo "#define BuildPlatform_TYPE  $(BuildPlatform_CPP)" >> $@
+       @echo "#define HostPlatform_TYPE   $(HostPlatform_CPP)" >> $@
+       @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@
+       @echo >> $@
+       @echo "#define $(BuildPlatform_CPP)_BUILD       1" >> $@
+       @echo "#define $(HostPlatform_CPP)_HOST         1" >> $@
+       @echo "#define $(TargetPlatform_CPP)_TARGET     1" >> $@
+       @echo >> $@
+       @echo "#define $(BuildArch_CPP)_BUILD_ARCH      1" >> $@
+       @echo "#define $(HostArch_CPP)_HOST_ARCH        1" >> $@
+       @echo "#define $(TargetArch_CPP)_TARGET_ARCH    1" >> $@
+       @echo "#define BUILD_ARCH \"$(BuildArch_CPP)\"" >> $@
+       @echo "#define HOST_ARCH \"$(HostArch_CPP)\"" >> $@
+       @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@
+       @echo >> $@
+       @echo "#define $(BuildOS_CPP)_BUILD_OS          1" >> $@
+       @echo "#define $(HostOS_CPP)_HOST_OS            1" >> $@
+       @echo "#define $(TargetOS_CPP)_TARGET_OS        1" >> $@  
+       @echo "#define BUILD_OS \"$(BuildOS_CPP)\"" >> $@
+       @echo "#define HOST_OS \"$(HostOS_CPP)\"" >> $@
+       @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@
+ifeq "$(HostOS_CPP)" "irix"
+       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS           " >> $@  
+       @echo "#define $(IRIX_MAJOR)_TARGET_OS          1" >> $@  
+       @echo "#endif                                    " >> $@  
+endif
+       @echo >> $@
+       @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR  1" >> $@
+       @echo "#define $(HostVendor_CPP)_HOST_VENDOR    1" >> $@
+       @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
+       @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\"" >> $@
+       @echo "#define HOST_VENDOR \"$(HostVendor_CPP)\"" >> $@
+       @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
+       @echo >> $@
+       @echo "#endif /* __PLATFORM_H__ */"          >> $@
+       @echo "Done."
+
+# For stage2 and above, the BUILD platform is the HOST of stage1, and
+# the HOST platform is the TARGET of stage1.  The TARGET remains the same
+# (stage1 is the cross-compiler, not stage2).
+stage2/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk Makefile
+       @echo "Creating $@..."
+       @$(RM) $@
+       @echo "#ifndef __PLATFORM_H__"  >$@
+       @echo "#define __PLATFORM_H__" >>$@
+       @echo >> $@
+       @echo "#define BuildPlatform_TYPE  $(HostPlatform_CPP)" >> $@
+       @echo "#define HostPlatform_TYPE   $(TargetPlatform_CPP)" >> $@
+       @echo "#define TargetPlatform_TYPE $(TargetPlatform_CPP)" >> $@
+       @echo >> $@
+       @echo "#define $(HostPlatform_CPP)_BUILD        1" >> $@
+       @echo "#define $(TargetPlatform_CPP)_HOST               1" >> $@
+       @echo "#define $(TargetPlatform_CPP)_TARGET     1" >> $@
+       @echo >> $@
+       @echo "#define $(HostArch_CPP)_BUILD_ARCH       1" >> $@
+       @echo "#define $(TargetArch_CPP)_HOST_ARCH      1" >> $@
+       @echo "#define $(TargetArch_CPP)_TARGET_ARCH    1" >> $@
+       @echo "#define BUILD_ARCH \"$(HostArch_CPP)\"" >> $@
+       @echo "#define HOST_ARCH \"$(TargetArch_CPP)\"" >> $@
+       @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@
+       @echo >> $@
+       @echo "#define $(HostOS_CPP)_BUILD_OS           1" >> $@
+       @echo "#define $(TargetOS_CPP)_HOST_OS          1" >> $@
+       @echo "#define $(TargetOS_CPP)_TARGET_OS        1" >> $@  
+       @echo "#define BUILD_OS \"$(HostOS_CPP)\"" >> $@
+       @echo "#define HOST_OS \"$(TargetOS_CPP)\"" >> $@
+       @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@
+ifeq "$(HostOS_CPP)" "irix"
+       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS           " >> $@  
+       @echo "#define $(IRIX_MAJOR)_TARGET_OS          1" >> $@  
+       @echo "#endif                                    " >> $@  
+endif
+       @echo >> $@
+       @echo "#define $(HostVendor_CPP)_BUILD_VENDOR   1" >> $@
+       @echo "#define $(TargetVendor_CPP)_HOST_VENDOR  1" >> $@
+       @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
+       @echo "#define BUILD_VENDOR \"$(HostVendor_CPP)\"" >> $@
+       @echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@
+       @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
+       @echo >> $@
+       @echo "#endif /* __PLATFORM_H__ */"          >> $@
+       @echo "Done."
+
+stage3/$(PLATFORM_H) : stage2/$(PLATFORM_H)
+       $(CP) stage2/$(PLATFORM_H) stage3/$(PLATFORM_H)
+
+boot :: stage$(stage)/$(PLATFORM_H)
+
+SRC_HC_OPTS += -Istage$(stage)
+
+# -----------------------------------------------------------------------------
 # Set SRCS etc.
 #
 # First figure out ALL_DIRS, the source sub-directories
 
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
-  specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis compMan ndpFlatten
+  specialise simplCore stranal stgSyn simplStg codeGen main \
+  profiling parser cprAnalysis compMan ndpFlatten iface cmm
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -260,32 +368,53 @@ endif
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 bootstrapped = YES
-compiling_with_4xx=NO
 else
 ifneq "$(findstring $(stage), 2 3)" ""
 bootstrapped = YES
-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)
 endif
 endif
 
-# Only include GHCi if we're bootstrapping with at least version 411
+# -----------------------------------------------------------------------------
+# Building a compiler with interpreter support
+#
+# The interpreter, GHCi interface, and Template Haskell are only
+# enabled when we are bootstrapping with the same version of GHC, and
+# the interpreter is supported on this platform.
+
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
+
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package haskell-src
+SRC_HC_OPTS += -DGHCI -package template-haskell
+
+ALL_DIRS += ghci
+
+# Enable readline if either:
+#   - we're building stage 1 and $(GhcHasReadline)="YES"
+#   - we're building stage 2/3, and we have built the readline package
+#
+# But we don't enable readline on Windows, because readline is fairly
+# broken there.
+#
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -package unix -package readline 
+ifeq "$(stage)" "1"
+ifeq "$(GhcHasReadline)" "YES"
+SRC_HC_OPTS += -package readline -DUSE_READLINE
 endif
-ALL_DIRS += ghci
 else
+ifeq "$(GhcLibsWithReadline)" "YES"
+SRC_HC_OPTS += -package readline -DUSE_READLINE
+endif
+endif # stage=1
+endif # not windows
+
+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)
+endif # bootstrapped with interpreter
 
 # -----------------------------------------------
 # mkdependC stuff
@@ -293,13 +422,17 @@ HS_OBJS    += $(C_OBJS)
 # Big Fudge to get around inherent problem that Makefile setup
 # has got with 'mkdependC'.
 # 
-SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+
+# XXX not really correct, hschooks.c actually gets include files like
+# RtsFlags.c from the installed GHC, but we can't tell mkdependC about that.
+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)
@@ -317,18 +450,21 @@ SRC_HC_OPTS += \
 # which needs it).
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
-# 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
+# We need System.Posix (or Posix when ghc < 6.2)
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
+SRC_HC_OPTS += -package posix
 else
-SRC_HC_OPTS += -package concurrent -package util
+SRC_HC_OPTS += -package unix
 endif
 endif
 
+ifneq "$(findstring YES, $(bootstrapped) $(ghc_ge_603))" ""
+SRC_HC_OPTS += -package Cabal
+endif
+
 SRC_CC_OPTS += -Iparser -I. -O
-SRC_HC_OPTS += -recomp $(GhcHcOpts)
+SRC_HC_OPTS += -recomp $(GhcHcOpts) $(GhcStage$(stage)HcOpts)
 SRC_HC_OPTS += -H16M
 
 ifeq "$(BootingFromHc)" "YES"
@@ -339,10 +475,9 @@ endif
 #      The standard suffix rule for compiling a Haskell file
 #      adds these flags to the command line
 
-# not sure if this is required --SDM
-main/Main_HC_OPTS              = -fvia-C
-
-prelude/PrimOp_HC_OPTS                 = -no-recomp -H80m
+# There used to be a -no-recomp flag on PrimOp, but why?
+# It's an expensive module to recompile!
+prelude/PrimOp_HC_OPTS                 = -H80m
 
 # because the NCG can't handle the 64-bit math in here
 prelude/PrelRules_HC_OPTS      = -fvia-C
@@ -350,33 +485,40 @@ 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.
-parser/Parser_HC_OPTS          += -Onot -fno-warn-incomplete-patterns -fvia-C
+parser/Parser_HC_OPTS          += -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"
-parser/Parser_HC_OPTS          += -K2m
-endif
+# Careful optimisation of the parser: we don't want to throw everything
+# at it, because that takes too long and doesn't buy much, but we do want
+# to inline certain key external functions, so we instruct GHC not to
+# throw away inlinings as it would normally do in -Onot mode:
+parser/Parser_HC_OPTS          += -Onot -fno-ignore-interface-pragmas
 
 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 
 
+basicTypes/SrcLoc_HC_OPTS      = -funbox-strict-fields
+
 ifeq "$(bootstrapped)" "YES"
 utils/Binary_HC_OPTS           = -funbox-strict-fields
 endif
 
-# 4.08.2's NCG can't cope with Binary
-ifeq "$(compiling_with_4xx)" "YES"
-utils/Binary_HC_OPTS           += -fvia-C
-endif
-
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
-ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
-ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
+ghci/ByteCodeItbls_HC_OPTS     += -fvia-C
+ghci/ByteCodeLink_HC_OPTS      += -fvia-C -monly-3-regs
+
+# BinIface and Binary take ages to both compile and run if you don's use -O
+main/BinIface_HC_OPTS          += -O
+utils/Binary_HC_OPTS           += -O
+utils/FastMutInt_HC_OPTS       += -O
+
+
+# ---- Profiling ----
+#simplCore/Simplify_HC_OPTS = -auto-all
+#simplCore/SimplEnv_HC_OPTS = -auto-all
+#simplCore/SimplUtils_HC_OPTS = -auto-all
 
 # 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
@@ -400,6 +542,8 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS          += '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
+parser/Lexer_HC_OPTS += -funbox-strict-fields
+
 # 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"'
@@ -419,17 +563,16 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-needs-wrapper.hs-incl  \
             primop-can-fail.hs-incl  \
             primop-strictness.hs-incl  \
-            primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
 CLEAN_FILES += prelude/primops.txt
 CLEAN_FILES += $(PRIMOP_BITS)
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
 SRC_CPP_OPTS += ${GhcCppOpts}
 
 ifneq "$(BootingFromHc)" "YES"
-prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
+prelude/PrimOp.lhs $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS)
 endif
 
 ifneq "$(BootingFromHc)" "YES"
@@ -454,22 +597,47 @@ primop-can-fail.hs-incl: prelude/primops.txt
        $(GENPOC) --can-fail           < $< > $@
 primop-strictness.hs-incl: prelude/primops.txt
        $(GENPOC) --strictness         < $< > $@
-primop-usage.hs-incl: prelude/primops.txt
-       $(GENPOC) --usage              < $< > $@
 primop-primop-info.hs-incl: prelude/primops.txt
        $(GENPOC) --primop-primop-info < $< > $@
 
+# Usages aren't used any more; but the generator 
+# can still generate them if we want them back
+primop-usage.hs-incl: prelude/primops.txt
+       $(GENPOC) --usage              < $< > $@
 
 
-# ----------------------------------------------------------------------------
-#              Parsers/lexers
-
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS  $(GHC_HAPPY_OPTS)
-
 #-----------------------------------------------------------------------------
 #              Linking
 
-SRC_LD_OPTS += -no-link-chk 
+# Include libghccompat in stage1 only.  In stage2 onwards, all these
+# libraries will be available from the main libraries.
+ifeq "$(stage)" "1"
+SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
+SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+
+ifeq "$(Windows)" "YES"
+# not very nice, but required for -lghccompat on Windows
+SRC_LD_OPTS += -lshell32
+endif
+
+# This is horrible.  We ought to be able to omit the entire directory
+# from mkDependHS.
+SRC_MKDEPENDHS_OPTS += \
+       -optdep--exclude-module=Compat.RawSystem \
+       -optdep--exclude-module=Compat.Directory \
+       -optdep--exclude-module=Distribution.Compat.ReadP \
+       -optdep--exclude-module=Distribution.Extension \
+       -optdep--exclude-module=Distribution.GetOpt \
+       -optdep--exclude-module=Distribution.InstalledPackageInfo \
+       -optdep--exclude-module=Distribution.License \
+       -optdep--exclude-module=Distribution.Package \
+       -optdep--exclude-module=Distribution.ParseUtils \
+       -optdep--exclude-module=Distribution.Setup \
+       -optdep--exclude-module=Distribution.Version \
+       -optdep--exclude-module=System.Directory.Internals
+endif
+
+SRC_LD_OPTS += -no-link-chk
 
 # -----------------------------------------------------------------------------
 # create ghc-inplace, a convenient way to run ghc from the build tree...
@@ -505,16 +673,56 @@ 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/RnEnv_HC_OPTS += -auto-all
 # rename/RnExpr_HC_OPTS += -auto-all
+# rename/RnHiFiles_HC_OPTS += -auto-all
 # rename/RnHsSyn_HC_OPTS += -auto-all
+# rename/Rename_HC_OPTS += -auto-all
+# rename/RnIfaces_HC_OPTS += -auto-all
 # rename/RnNames_HC_OPTS += -auto-all
+# rename/RnSource_HC_OPTS += -auto-all
 # rename/RnTypes_HC_OPTS += -auto-all
+# 
+# typecheck/Inst_HC_OPTS += -auto-all
+# typecheck/TcBinds_HC_OPTS += -auto-all
+# typecheck/TcClassDcl_HC_OPTS += -auto-all
+# typecheck/TcDefaults_HC_OPTS += -auto-all
+# typecheck/TcDeriv_HC_OPTS += -auto-all
+# typecheck/TcEnv_HC_OPTS += -auto-all
+# typecheck/TcExpr_HC_OPTS += -auto-all
+# typecheck/TcForeign_HC_OPTS += -auto-all
+# typecheck/TcGenDeriv_HC_OPTS += -auto-all
+# typecheck/TcHsSyn_HC_OPTS += -auto-all
+# typecheck/TcIfaceSig_HC_OPTS += -auto-all
+# typecheck/TcInstDcls_HC_OPTS += -auto-all
+# typecheck/TcMatches_HC_OPTS += -auto-all
+# typecheck/TcMonoType_HC_OPTS += -auto-all
+# typecheck/TcMType_HC_OPTS += -auto-all
+# typecheck/TcPat_HC_OPTS += -auto-all
+# typecheck/TcRnDriver_HC_OPTS += -auto-all
+# #typecheck/TcRnMonad_HC_OPTS += -auto-all
+# #typecheck/TcRnTypes_HC_OPTS += -auto-all
+# typecheck/TcRules_HC_OPTS += -auto-all
+# typecheck/TcSimplify_HC_OPTS += -auto-all
+# typecheck/TcSplice_HC_OPTS += -auto-all
+# typecheck/TcTyClsDecls_HC_OPTS += -auto-all
+# typecheck/TcTyDecls_HC_OPTS += -auto-all
+# typecheck/TcType_HC_OPTS += -auto-all
+# typecheck/TcUnify_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
@@ -528,6 +736,20 @@ MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info
 MKDEPENDHS_SRCS =
 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
 
 # -----------------------------------------------------------------------------
@@ -539,7 +761,10 @@ MKDEPENDHS=$(HC)
 
 # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet.
 depend :: $(HS_SRCS) $(C_SRCS)
+       touch .depend-BASE
+ifneq "$(BootingFromHc)" "YES"
        $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
+endif
        $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) 
        $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
 # The binmode stuff tells perl not to add stupid ^M's to the output