X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=806908bee9ba235dae218eb11d408c3cedce45e2;hb=a27271f99ff254f995a9403fe36e41b9588d1b32;hp=022e026136fcc8cfcc4fcc69fb45add45541de74;hpb=3a7fa9bb3cee6c1b4c26bc5ba91f9afe97fa502f;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 022e026..806908b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -257,6 +257,14 @@ GhcWithJavaGen=NO
 
 HaveLibDL = @HaveLibDL@
 
+ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc)))
+
+ifeq "$(ArchSupportsSMP)$(GhcUnregisterised)" "YESNO"
+GhcWithSMP=YES
+else
+GhcWithSMP=NO
+endif
+
 # Whether to include GHCi in the compiler.  Depends on whether the RTS linker
 # has support for this OS/ARCH combination.
 
@@ -377,18 +385,6 @@ ifeq "$(TargetArch_CPP)" "ia64"
 SplitObjs=NO
 endif
 
-# Build the Haskell Readline bindings?
-#
-GhcLibsWithReadline=@GhcLibsWithReadline@
-
-# Libraries needed for linking with readline
-LibsReadline=@LibsReadline@
-
-# Include path to readline.h
-# (no path == in standard include path)
-#
-ReadlineIncludePath=
-
 # Math library
 LIBM=@LIBM@
 
@@ -465,10 +461,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).
@@ -493,7 +489,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
@@ -791,6 +787,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
 
@@ -806,6 +803,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