X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=bdaed164d5f6aef5946e384b8d12069f2beeacff;hb=8fda9784f1eff82aa243073fd31b181080be3109;hp=59446a9d5d52a53ddbb95bb4f124fcdc02bd7ffd;hpb=49fcef380f65b32ad03ce04171b6019ab48a714e;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 59446a9..bdaed16 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -185,9 +185,6 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 XMLDocWays=
 
-# Should we build haddock docs?
-HADDOCK_DOCS = YES
-
 # Should we build latex docs?
 LATEX_DOCS = NO
 
@@ -279,9 +276,8 @@ endif
 #
 # Target platforms supported:
 #   i386, powerpc
-#   sparc has bitrotted
 #   AIX is not supported 
-ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc)))
+ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc)))
 OsSupportsNCG=$(strip $(patsubst $(HostOS_CPP), YES, $(patsubst aix,,$(HostOS_CPP))))
 
 # lazy test, because $(GhcUnregisterised) might be set in build.mk later.
@@ -398,7 +394,7 @@ GhcRTSWays += debug
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
-GhcRTSWays += debug_dyn thr_dyn thr_debug_dyn
+GhcRTSWays += dyn debug_dyn thr_dyn thr_debug_dyn
 endif
 
 # Want the threaded versions unless we're unregisterised
@@ -445,21 +441,26 @@ PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
 #		system needs to do other special magic if you are
 #		doing object-file splitting
 
+ArchSupportsSplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),YES,NO))
+
 # lazy test, so that $(GhcUnregisterised) can be set in build.mk
-SplitObjs=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64 powerpc sparc),\
-	            $(if $(filter YES,$(BootingFromHC)),\
-		      NO,\
-	              $(if $(filter NO,$(GhcUnregisterised)),\
-			YES,\
-			NO)),\
-		    NO))
+SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\
+	            $(if $(filter NO,$(BootingFromHc)),\
+		      $(if $(filter NO,$(GhcUnregisterised)),\
+	                YES,\
+			NO),\
+                      NO),\
+                    NO))
+
+# By default, enable SplitObjs for the libraries if this build supports it
+SplitObjs=$(SupportsSplitObjs)
 
 # Math library
 LIBM=@LIBM@
 
 # .NET interop support?
 #
-DotnetSupport=@DotnetSupport@
+DotnetSupport=NO
 
 # Build unix package?
 #
@@ -546,7 +547,7 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
 
 BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TAR=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
+BIN_DIST_TAR=$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
 BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2
 BIN_DIST_PREP_DIR=$(FPTOOLS_TOP_ABS)/bindist-prep
 BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME)
@@ -929,14 +930,12 @@ GhcPatchLevel	= @ProjectPatchLevel@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
 
-ghc_ge_605 = YES
 ghc_ge_607 = YES
 ghc_ge_609 = YES
 
 else # not UseStage1 or BootingFromHc
 
 # Some useful GHC version predicates:
-ghc_ge_605 = @ghc_ge_605@
 ghc_ge_607 = @ghc_ge_607@
 ghc_ge_609 = @ghc_ge_609@
 
@@ -1193,6 +1192,15 @@ ALEX_VERSION		= @AlexVersion@
 #
 GHC_ALEX_OPTS		= -g
 
+# Should we build haddock docs?
+HADDOCK_DOCS = YES
+# And HsColour the sources?
+ifeq "$(HSCOLOUR)" ""
+HSCOLOUR_SRCS = NO
+else
+HSCOLOUR_SRCS = YES
+endif
+
 #
 # Options for compiling in different `ways'. 
 #