X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fconfig.mk.in;h=e3060ec20ce7261b6808d62047a8a7420b8c5ce8;hb=e82757929e50912f9c5de8b272fcc9b060ec6328;hp=b121518a7bb746ffaddff0495ff3af98d2ddff45;hpb=f3cdd93b05a52ac8c77ea93288a9fd3ee1210f99;p=ghc-hetmet.git

diff --git a/ghc/mk/config.mk.in b/ghc/mk/config.mk.in
index b121518..e3060ec 100644
--- a/ghc/mk/config.mk.in
+++ b/ghc/mk/config.mk.in
@@ -17,10 +17,12 @@ else
 GhcBinDistShScripts =
 endif
 
-GhcBinDistPrlScripts = 
+GhcBinDistPrlScripts = ghcprof
 GhcBinDistLibPrlScripts = ghc-asm ghc-split
-GhcBinDistBins = hp2ps ghcprof
+GhcBinDistBins = hp2ps runghc
+GhcBinDistOptBins = runhaskell
 GhcBinDistLinks = ghc ghci ghc-pkg
+GhcBinDistLibSplicedFiles = package.conf
 
 # -----------------------------------------------------------------------------
 # GHC-specific configuration settings
@@ -30,3 +32,36 @@ GhcHasReadline	= @GhcHasReadline@
 
 # GTK+
 GTK_CONFIG = @GTK_CONFIG@
+
+# -----------------------------------------------------------------------------
+
+# We can build using the stage1 compiler by setting UseStage1=YES.
+# This is useful when building up a set of .hc files for
+# bootstrapping, because we need the ghc/lib/compat library and the
+# contents of ghc/utils compiled with the stage1 compiler.
+
+ifeq "$(UseStage1)" "YES"
+HC=$(GHC_STAGE1)
+MKDEPENDHS=$(GHC_STAGE1)
+endif
+
+# Some useful GHC version predicates:
+
+ifeq "$(UseStage1)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ifeq "$(BootingFromHc)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
+ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
+ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
+endif
+endif