X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=043d60aba09a4a56f8a8f105eeae9fd75eab274e;hb=8c2549461d624ad5cfec9be3266bdfd016371658;hp=da16624adb9dd431916b77526ed285a3cc6432e4;hpb=30f7fffbe717563d0f68ea8e95f747aafff837ef;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index da16624..043d60a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -259,7 +259,7 @@ HaveLibDL = @HaveLibDL@
 
 ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc)))
 
-ifeq "$(ArchSupportsSMP)" "YES"
+ifeq "$(ArchSupportsSMP)$(GhcUnregisterised)" "YESNO"
 GhcWithSMP=YES
 else
 GhcWithSMP=NO
@@ -277,6 +277,23 @@ else
 GhcWithInterpreter=NO
 endif
 
+# GhcWithTablesNextToCode, which corresponds to the TABLES_NEXT_TO_CODE
+# CPP symbol, says whether to assume that info tables are assumed to
+# reside just before the code for a function.
+ifeq "$(GhcUnregisterised)" "YES"
+GhcWithTablesNextToCode=NO
+GhcWithNoRegs=YES
+GhcWithMiniInterpreter=YES
+else
+ifeq "$(findstring $(HostArch_CPP), ia64 powerpc64)" ""
+GhcWithTablesNextToCode=YES
+else
+GhcWithTablesNextToCode=NO
+endif
+GhcWithNoRegs=NO
+GhcWithMiniInterpreter=NO
+endif
+
 #
 # Building various ways?
 # (right now, empty if not).
@@ -355,6 +372,15 @@ DLLized=@EnableWin32DLLs@
 #
 StripLibraries=NO
 
+# These are the URL patterns that Haddock uses to generate the "Source
+# File" links on each page.
+CorePackageSourceURL = http://darcs.haskell.org/ghc-6.6/packages/$(PACKAGE)/%{FILE}
+ExtraPackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
+
+# These are the packages required to be present in order to bootstrap GHC
+# NB. must be synced with libraries/core-packages
+CorePackages = base Cabal haskell98 readline regex-base regex-compat \
+	       regex-posix parsec stm template-haskell unix Win32
 
 # ----------------------------------------------------------------------------
 # Object-file splitting
@@ -461,10 +487,10 @@ NoFibRuns = 5
 
 DEFAULT_TMPDIR		= /tmp
 ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
-DEFAULT_TMPDIR		= C:/TEMP
+DEFAULT_TMPDIR		= /C/TEMP
 endif
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-DEFAULT_TMPDIR		= C:/TEMP
+DEFAULT_TMPDIR		= /C/TEMP
 endif
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
@@ -489,7 +515,7 @@ mandir			= @mandir@
 ifeq "$(Windows)" "YES"
 
 ifeq "$(strip $(prefix))" ""
-prefix		= c:/ghc
+prefix		= /c/ghc
 endif
 
 # Hack: our directory layouts tend to be different on Windows, so
@@ -787,6 +813,7 @@ ghc_ge_504 = YES
 ghc_ge_601 = YES
 ghc_ge_602 = YES
 ghc_ge_603 = YES
+ghc_ge_605 = YES
 
 else # not UseStage1 or BootingFromHc
 
@@ -802,6 +829,7 @@ ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else e
 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)
+ghc_ge_605 = $(shell if (test $(GhcCanonVersion) -ge 605); then echo YES; else echo NO; fi)
 endif
 
 # Canonicalised ghc version number, used for easy (integer) version