X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=d4882a5868ad0d85dd690daa8bc4bdba13e43298;hb=3710a4ef1ca665fe4ed705a6b0f4400d680c7b54;hp=e869d9c4031651fed1f3d39ebb7dc22fbb968316;hpb=960b35ddc178f6b8af1a8809aecb0a43177abbc8;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index e869d9c..d4882a5 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -22,7 +22,7 @@ library-dirs:		LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
 # endif
 #else /* !INSTALLING */
 library-dirs:		FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
 			, FPTOOLS_TOP_ABS"/gmp"
 # endif
 #endif
@@ -61,8 +61,9 @@ extra-libraries:		"m"		/* for ldexp() */
 include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
 include-dirs:		FPTOOLS_TOP_ABS"/includes"
-             		FPTOOLS_TOP_ABS"/rts"
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
              		FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+# endif
              		GMP_INCLUDE_DIRS
 #endif
 
@@ -107,6 +108,8 @@ ld-options:
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "_base_GHCziTopHandler_runIO_closure"
          , "-u", "_base_GHCziTopHandler_runNonIO_closure"
+	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "_base_GHCziConc_runSparks_closure"
 #else
            "-u", "ghczmprim_GHCziTypes_Izh_static_info"
          , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@ -142,12 +145,8 @@ ld-options:
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "base_GHCziTopHandler_runIO_closure"
          , "-u", "base_GHCziTopHandler_runNonIO_closure"
-#endif
-
-#ifdef LEADING_UNDERSCORE
-	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
-#else
 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "base_GHCziConc_runSparks_closure"
 #endif
 
 /*  Pick up static libraries in preference over dynamic if in earlier search
@@ -158,6 +157,10 @@ ld-options:
 	 , "-Wl,-search_paths_first"
 #endif
 
+#ifdef darwin_HOST_OS
+         , "-read_only_relocs", "warning"
+#endif
+
 framework-dirs:
 
 #ifdef HAVE_FRAMEWORK_GMP