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

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 54f3b27..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
@@ -15,36 +16,26 @@ hidden-modules:
 import-dirs:
 
 #ifdef INSTALLING
-library-dirs:		LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
-# ifdef mingw32_HOST_OS
-			, LIB_DIR"/gcc-lib"
-			/* force the dist-provided gcc-lib/ into scope. */
-# endif
+library-dirs:		LIB_DIR PAPI_LIB_DIR
 #else /* !INSTALLING */
-library-dirs:		TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
-			, TOP"/gmp"
-# endif
+library-dirs:		TOP"/rts/dist/build" PAPI_LIB_DIR
 #endif
 
 hs-libraries:   "HSrts"
 
-extra-libraries:		"m"		/* for ldexp() */
-#ifndef HAVE_FRAMEWORK_GMP
-			      , "gmp"
-#ifdef HAVE_LIBDL
-			      , "dl"
-#endif
+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
@@ -58,17 +49,13 @@ extra-libraries:		"m"		/* for ldexp() */
 #endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
+include-dirs:		INCLUDE_DIR PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
 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:	 	ffi-1.0
+depends:	 	builtin_ffi
 hugs-options:
 cc-options:
 
@@ -99,11 +86,11 @@ ld-options:
          , "-u", "_ghczmprim_GHCziBool_False_closure"
          , "-u", "_ghczmprim_GHCziBool_True_closure"
          , "-u", "_base_GHCziPack_unpackCString_closure"
-         , "-u", "_base_GHCziIOBase_stackOverflow_closure"
-         , "-u", "_base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "_base_GHCziIOziException_stackOverflow_closure"
+         , "-u", "_base_GHCziIOziException_heapOverflow_closure"
          , "-u", "_base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "_base_GHCziIOBase_blockedOnDeadMVar_closure"
-         , "-u", "_base_GHCziIOBase_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"
@@ -137,11 +124,11 @@ ld-options:
          , "-u", "ghczmprim_GHCziBool_False_closure"
          , "-u", "ghczmprim_GHCziBool_True_closure"
          , "-u", "base_GHCziPack_unpackCString_closure"
-         , "-u", "base_GHCziIOBase_stackOverflow_closure"
-         , "-u", "base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "base_GHCziIOziException_stackOverflow_closure"
+         , "-u", "base_GHCziIOziException_heapOverflow_closure"
          , "-u", "base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "base_GHCziIOBase_blockedOnDeadMVar_closure"
-         , "-u", "base_GHCziIOBase_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"
@@ -165,12 +152,6 @@ ld-options:
 
 framework-dirs:
 
-#ifdef HAVE_FRAMEWORK_GMP
-frameworks:	"GMP"
-#else
-frameworks:
-#endif
-
 haddock-interfaces:
 haddock-html: