X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=b46c3d78f57d544e38791f291dbce29d073c3006;hb=83adb5d625b3821ff3bd29596437a780db8fa98f;hp=7ebcbc6d22305b2224f173189b6a7c1956f8aaa5;hpb=cbc5fb05036f3c1990b2f9f91b9e1c66b97a392f;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 7ebcbc6..b46c3d7 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -22,16 +22,14 @@ 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
-                        , FPTOOLS_TOP_ABS"/libffi"
 #endif
 
 hs-libraries:   "HSrts"
 
 extra-libraries:		"m"		/* for ldexp() */
-			      , "ffi"
 #ifndef HAVE_FRAMEWORK_GMP
 			      , "gmp"
 #ifdef HAVE_LIBDL
@@ -61,18 +59,17 @@ extra-libraries:		"m"		/* for ldexp() */
 
 #ifdef INSTALLING
 include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
-# ifdef mingw32_HOST_OS
-			, INCLUDE_DIR"/mingw"
-# endif
 #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
 
 includes:		Stg.h
-depends:	 	
+depends:	 	ffi-1.0
 hugs-options:
 cc-options:
 
@@ -110,6 +107,10 @@ ld-options:
          , "-u", "_base_GHCziIOBase_blockedIndefinitely_closure"
          , "-u", "_base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-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"
@@ -143,12 +144,10 @@ ld-options:
          , "-u", "base_GHCziIOBase_blockedIndefinitely_closure"
          , "-u", "base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
-#endif
-
-#ifdef LEADING_UNDERSCORE
-	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
-#else
+         , "-u", "base_GHCziTopHandler_runIO_closure"
+         , "-u", "base_GHCziTopHandler_runNonIO_closure"
 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "base_GHCziConc_runSparks_closure"
 #endif
 
 /*  Pick up static libraries in preference over dynamic if in earlier search
@@ -159,6 +158,10 @@ ld-options:
 	 , "-Wl,-search_paths_first"
 #endif
 
+#ifdef darwin_HOST_OS
+         , "-read_only_relocs", "warning"
+#endif
+
 framework-dirs:
 
 #ifdef HAVE_FRAMEWORK_GMP