GHC new build system megapatch

[ghc-hetmet.git] / rts / package.conf.in

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 1b274c9..54f3b27 100644 (file)
--- 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
@@ -62,14 +60,15 @@ extra-libraries:            "m"             /* for ldexp() */
 #ifdef INSTALLING
 include-dirs:          INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
 #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:
 
@@ -109,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"
@@ -144,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
@@ -160,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