Maintain Task/Capability invariants in performPendingThrowTos

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b35b4b6..a516e6d 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -152,7 +152,7 @@ GhcWithNativeCodeGen=$(strip\
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in
-# includes/SMP.h
+# includes/stg/SMP.h
 ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc powerpc)))
 
 # lazy test, because $(GhcUnregisterised) might be set in build.mk later.
@@ -251,7 +251,7 @@ GhcRTSWays += debug
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
-GhcRTSWays += dyn debug_dyn thr_dyn thr_debug_dyn
+GhcRTSWays += dyn debug_dyn $(if $(findstring NO, $(GhcUnregisterised)),thr_dyn thr_debug_dyn)
 endif
 
 # Want the threaded versions unless we're unregisterised
@@ -537,6 +537,7 @@ HaveGcc     = @HaveGcc@
 UseGcc         = YES
 WhatGccIsCalled = @WhatGccIsCalled@
 GccVersion      = @GccVersion@
+GccLT34                = @GccLT34@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC   = cc
@@ -852,7 +853,6 @@ WAY_thr_debug_l_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -eventlog
 # Way 'dyn': build dynamic shared libraries
 WAY_dyn_NAME=dyn
 WAY_dyn_HC_OPTS=-fPIC -dynamic
-WAY_dyn_LIB_TARGET=libHSrts-gcc661.so
 
 # Way 'thr_dyn':
 WAY_thr_dyn_NAME=thr_dyn
@@ -946,6 +946,15 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@
 
 ################################################################################
 #
+#    To be passed to sub-builds
+#
+################################################################################
+
+ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@
+ICONV_LIB_DIRS = @ICONV_LIB_DIRS@
+
+################################################################################
+#
 #    Bindist testing directory
 #
 ################################################################################