X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=c60bf8759a38a94043abe470da5625428d43c0fa;hb=6cec61d14a324285dbb8ce73d4c7215f1f8d6766;hp=1112b99d5f3738f1712fe82cd7f4d1d42708fe65;hpb=72547264724117d689a7fa400104185557fb2a0c;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 1112b99..c60bf87 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -5,7 +5,7 @@
 
 name:		rts
 version:	1.0
-id:             builtin:rts
+id:             builtin_rts
 license:	BSD3
 maintainer:	glasgow-haskell-users@haskell.org
 exposed:	True
@@ -17,17 +17,16 @@ 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
@@ -56,7 +55,7 @@ include-dirs:		TOP"/includes"
 #endif
 
 includes:		Stg.h
-depends:	 	builtin:ffi
+depends:	 	builtin_ffi
 hugs-options:
 cc-options:
 
@@ -84,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"
@@ -122,32 +121,32 @@ 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
 
-#ifdef darwin_HOST_OS
+#if defined(darwin_HOST_OS) && !defined(x86_64_HOST_ARCH)
          , "-read_only_relocs", "warning"
 #endif