X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=0cc63133fd77537ba076927605a07384d3aa412b;hb=fff1f6194c3c39de53cd645bda9865fb131b1c68;hp=d10ed0dfa2189b963a29e96274df96e83c11e31c;hpb=342c32deb5176483dfce3befbd68893740df857e;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index d10ed0d..0cc6313 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:
 
@@ -96,21 +83,21 @@ ld-options:
          , "-u", "_base_GHCziPtr_Ptr_con_info"
          , "-u", "_base_GHCziPtr_FunPtr_con_info"
          , "-u", "_base_GHCziStable_StablePtr_con_info"
-         , "-u", "_ghczmprim_GHCziBool_False_closure"
-         , "-u", "_ghczmprim_GHCziBool_True_closure"
+         , "-u", "_ghczmprim_GHCziTypes_False_closure"
+         , "-u", "_ghczmprim_GHCziTypes_True_closure"
          , "-u", "_base_GHCziPack_unpackCString_closure"
          , "-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"
          , "-u", "_base_GHCziTopHandler_runNonIO_closure"
-	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
-	 , "-u", "_base_GHCziConc_runSparks_closure"
-	 , "-u", "_base_GHCziConc_runHandlers_closure"
+	 , "-u", "_base_GHCziConcziIO_ensureIOManagerIsRunning_closure"
+	 , "-u", "_base_GHCziConcziSync_runSparks_closure"
+	 , "-u", "_base_GHCziConcziSignal_runHandlers_closure"
 #else
            "-u", "ghczmprim_GHCziTypes_Izh_static_info"
          , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@ -134,28 +121,28 @@ ld-options:
          , "-u", "base_GHCziPtr_Ptr_con_info"
          , "-u", "base_GHCziPtr_FunPtr_con_info"
          , "-u", "base_GHCziStable_StablePtr_con_info"
-         , "-u", "ghczmprim_GHCziBool_False_closure"
-         , "-u", "ghczmprim_GHCziBool_True_closure"
+         , "-u", "ghczmprim_GHCziTypes_False_closure"
+         , "-u", "ghczmprim_GHCziTypes_True_closure"
          , "-u", "base_GHCziPack_unpackCString_closure"
          , "-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"
          , "-u", "base_GHCziTopHandler_runNonIO_closure"
-	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
-	 , "-u", "base_GHCziConc_runSparks_closure"
-	 , "-u", "base_GHCziConc_runHandlers_closure"
+	 , "-u", "base_GHCziConcziIO_ensureIOManagerIsRunning_closure"
+	 , "-u", "base_GHCziConcziSync_runSparks_closure"
+	 , "-u", "base_GHCziConcziSignal_runHandlers_closure"
 #endif
 
 /*  Pick up static libraries in preference over dynamic if in earlier search
  *  path.  This is important to use the static gmp in preference on Mac OS.
  *  The used option is specific to the Darwin linker.
  */
-#ifdef darwin_BUILD_OS
+#ifdef darwin_HOST_OS
 	 , "-Wl,-search_paths_first"
 #endif
 
@@ -165,12 +152,6 @@ ld-options:
 
 framework-dirs:
 
-#ifdef HAVE_FRAMEWORK_GMP
-frameworks:	"GMP"
-#else
-frameworks:
-#endif
-
 haddock-interfaces:
 haddock-html: