X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=54f3b27543efd78a0018f5f41c1812780de83f1c;hp=bae12f8fc2891cc02adf9c54be14e4cf64e50397;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hpb=4e1f1196f1349286c1480c19bd3a000346a120f4

diff --git a/rts/package.conf.in b/rts/package.conf.in
index bae12f8..54f3b27 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -3,7 +3,7 @@
 #include "ghcconfig.h"
 #include "RtsConfig.h"
 
-name:		PACKAGE
+name:		rts
 version:	1.0
 license:	BSD3
 maintainer:	glasgow-haskell-users@haskell.org
@@ -21,17 +21,15 @@ library-dirs:		LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
 			/* force the dist-provided gcc-lib/ into scope. */
 # endif
 #else /* !INSTALLING */
-library-dirs:		FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
-			, FPTOOLS_TOP_ABS"/gmp"
+library-dirs:		TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
+			, TOP"/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,16 @@ 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"
-             		FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+include-dirs:		TOP"/includes"
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
+             		TOP"/gmp/gmpbuild"
+# endif
              		GMP_INCLUDE_DIRS
 #endif
 
 includes:		Stg.h
-depends:	 	
+depends:	 	ffi-1.0
 hugs-options:
 cc-options:
 
@@ -112,6 +108,9 @@ 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"
+	 , "-u", "_base_GHCziConc_runHandlers_closure"
 #else
            "-u", "ghczmprim_GHCziTypes_Izh_static_info"
          , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@ -147,12 +146,9 @@ 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"
+	 , "-u", "base_GHCziConc_runHandlers_closure"
 #endif
 
 /*  Pick up static libraries in preference over dynamic if in earlier search
@@ -163,6 +159,10 @@ ld-options:
 	 , "-Wl,-search_paths_first"
 #endif
 
+#ifdef darwin_HOST_OS
+         , "-read_only_relocs", "warning"
+#endif
+
 framework-dirs:
 
 #ifdef HAVE_FRAMEWORK_GMP