we don't have a gcc-lib in LIB_DIR any more

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

diff --git a/rts/package.conf.in b/rts/package.conf.in
index c75294d..34ca7f9 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -1,10 +1,11 @@
 /* The RTS is just another package! */
 
 #include "ghcconfig.h"
-#include "RtsConfig.h"
+#include "rts/Config.h"
 
 name:          rts
 version:       1.0
+id:             builtin_rts
 license:       BSD3
 maintainer:    glasgow-haskell-users@haskell.org
 exposed:       True
@@ -16,26 +17,25 @@ import-dirs:
 
 #ifdef INSTALLING
 library-dirs:          LIB_DIR PAPI_LIB_DIR
-# ifdef mingw32_HOST_OS
-                       , LIB_DIR"/gcc-lib"
-                       /* force the dist-provided gcc-lib/ into scope. */
-# endif
 #else /* !INSTALLING */
 library-dirs:          TOP"/rts/dist/build" PAPI_LIB_DIR
 #endif
 
 hs-libraries:   "HSrts"
 
-extra-libraries:               "m"             /* for ldexp() */
+extra-libraries:
+#ifdef HAVE_LIBM
+                               "m"             /* for ldexp() */
+#endif
 #ifdef HAVE_LIBRT
                              , "rt"
 #endif
+#ifdef HAVE_LIBDL
+                             , "dl"
+#endif
 #ifdef mingw32_HOST_OS
                              ,"wsock32"        /* for the linker */
 #endif
-#ifdef WANT_DOTNET_SUPPORT
-                             , "oleaut32", "ole32", "uuid"
-#endif
 #if defined(DEBUG) && defined(HAVE_LIBBFD)
                              ,"bfd", "iberty"  /* for debugging */
 #endif
@@ -52,9 +52,10 @@ extra-libraries:             "m"             /* for ldexp() */
 include-dirs:          INCLUDE_DIR PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
 include-dirs:          TOP"/includes"
+#endif
 
 includes:              Stg.h
-depends:               ffi-1.0
+depends:               builtin_ffi
 hugs-options:
 cc-options:
 
@@ -88,8 +89,8 @@ ld-options:
          , "-u", "_base_GHCziIOziException_stackOverflow_closure"
          , "-u", "_base_GHCziIOziException_heapOverflow_closure"
          , "-u", "_base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "_base_GHCziIOziException_blockedOnDeadMVar_closure"
-         , "-u", "_base_GHCziIOziException_blockedIndefinitely_closure"
+         , "-u", "_base_GHCziIOziException_blockedIndefinitelyOnMVar_closure"
+         , "-u", "_base_GHCziIOziException_blockedIndefinitelyOnSTM_closure"
          , "-u", "_base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "_base_GHCziTopHandler_runIO_closure"
@@ -126,8 +127,8 @@ ld-options:
          , "-u", "base_GHCziIOziException_stackOverflow_closure"
          , "-u", "base_GHCziIOziException_heapOverflow_closure"
          , "-u", "base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "base_GHCziIOziException_blockedOnDeadMVar_closure"
-         , "-u", "base_GHCziIOziException_blockedIndefinitely_closure"
+         , "-u", "base_GHCziIOziException_blockedIndefinitelyOnMVar_closure"
+         , "-u", "base_GHCziIOziException_blockedIndefinitelyOnSTM_closure"
          , "-u", "base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "base_GHCziTopHandler_runIO_closure"