X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=bf97a163795b8e20bb28a0dd9c60f90930277cfc;hb=a12e845684c10955bc594cdb20d1f13fae14873d;hp=22c6f921c5b0be9c5902f3b6b12e02d6f2095d4a;hpb=c7ad7938dc1d27a2471b0b803ac3e70102414a3d;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 22c6f92..bf97a16 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -187,6 +187,8 @@ XMLDocWays= # Should we build haddock docs? HADDOCK_DOCS = YES +# And HsColour the sources? +HSCOLOUR_SRCS = YES # Should we build latex docs? LATEX_DOCS = NO @@ -247,7 +249,7 @@ GhcStage3HcOpts=-O2 GhcProfiled=NO GhcDebugged=NO -GhcLibProfiled=NO +GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO) # Build shared and/or static libs? BuildSharedLibs=@BuildSharedLibs@ @@ -279,9 +281,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 +399,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 @@ -459,7 +460,7 @@ LIBM=@LIBM@ # .NET interop support? # -DotnetSupport=@DotnetSupport@ +DotnetSupport=NO # Build unix package? # @@ -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@