X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=34ca7f9cf1e055f8e540a28fb8a943b3ccefb3a3;hb=17c8229adf9f268097e4c87053d940a918c3a26f;hp=3b890d7db65124e8c0772f680a3cdd86b6e61d97;hpb=f4e682c8f54a70cacbc412c1bd24cf619e1023e7;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 3b890d7..34ca7f9 100644
--- 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,20 +17,22 @@ 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
@@ -52,7 +55,7 @@ include-dirs:		TOP"/includes"
 #endif
 
 includes:		Stg.h
-depends:	 	ffi-1.0
+depends:	 	builtin_ffi
 hugs-options:
 cc-options:
 
@@ -86,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"
@@ -124,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"