Massive patch for the first months work adding System FC to GHC #15

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index da16624..dc69ff2 100644 (file)
--- 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
@@ -787,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
 
@@ -802,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