update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 01019b8..18e60e7 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -120,8 +120,8 @@ SharedLibsPlatformList = i386-unknown-linux x86_64-unknown-linux \
        i386-unknown-mingw32 \
        i386-apple-darwin powerpc-apple-darwin
 
-ifeq ($(SOLARIS_BROKEN_SHLD), NO)
-SharedLibsPlatformList := $(SharedLibsPlatformList) i386-unknown-solaris2
+ifeq "$(SOLARIS_BROKEN_SHLD)" "NO"
+SharedLibsPlatformList += i386-unknown-solaris2
 endif
 
 PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\
@@ -282,13 +282,8 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 #
 #      -O(2) is pretty desirable, otherwise no inlining of prelude
 #              things (incl "+") happens when compiling with this compiler
-#
-#      -XGenerics switches on generation of support code for 
-#              derivable type classes.  This is now off by default,
-#              but we switch it on for the libraries so that we generate
-#              the code in case someone importing wants it
 
-GhcLibHcOpts=-O2 -XGenerics
+GhcLibHcOpts=-O2
 
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
@@ -544,10 +539,15 @@ WhatGccIsCalled = @WhatGccIsCalled@
 GccVersion      = @GccVersion@
 GccLT34         = @GccLT34@
 CC              = $(WhatGccIsCalled)
-CC_STAGE0       = $(CC)
+CC_STAGE0       = @CC_STAGE0@
 CC_STAGE1       = $(CC)
 CC_STAGE2       = $(CC)
 CC_STAGE3       = $(CC)
+AS              = $(WhatGccIsCalled)
+AS_STAGE0       = @CC_STAGE0@
+AS_STAGE1       = $(AS)
+AS_STAGE2       = $(AS)
+AS_STAGE3       = $(AS)
 
 # C compiler and linker flags from configure (e.g. -m<blah> to select
 # correct C compiler backend). The stage number is the stage of GHC
@@ -599,11 +599,11 @@ AR                        = @ArCmd@
 AR_OPTS                        = @ArArgs@
 ArSupportsAtFile = @ArSupportsAtFile@
 
-AR_STAGE0 = $(AR)
+AR_STAGE0 = @AR_STAGE0@
 AR_STAGE1 = $(AR)
 AR_STAGE2 = $(AR)
 AR_STAGE3 = $(AR)
-AR_OPTS_STAGE0 = $(AR_OPTS)
+AR_OPTS_STAGE0 = @AR_OPTS_STAGE0@
 AR_OPTS_STAGE1 = $(AR_OPTS)
 AR_OPTS_STAGE2 = $(AR_OPTS)
 AR_OPTS_STAGE3 = $(AR_OPTS)
@@ -611,7 +611,7 @@ EXTRA_AR_ARGS_STAGE0 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE1 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE2 = $(EXTRA_AR_ARGS)
 EXTRA_AR_ARGS_STAGE3 = $(EXTRA_AR_ARGS)
-ArSupportsAtFile_STAGE0 = $(ArSupportsAtFile)
+ArSupportsAtFile_STAGE0 = @ArSupportsAtFile_STAGE0@
 ArSupportsAtFile_STAGE1 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE2 = $(ArSupportsAtFile)
 ArSupportsAtFile_STAGE3 = $(ArSupportsAtFile)
@@ -769,8 +769,6 @@ ALEX_VERSION                = @AlexVersion@
 #
 SRC_ALEX_OPTS          = -g
 
-HSTAGS = @HstagsCmd@
-
 # Should we build haddock docs?
 HADDOCK_DOCS = YES
 # And HsColour the sources?