X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=ab5a7238edaa68c70731f378168ada6a55508895;hb=bb82786487a86283c7083a7a7e5b9971aa6a405a;hp=0d787f5bad26bcedd8ceafd71da85d7214342de0;hpb=db0309b6aea4d44f525bb66b7732002061b84a42;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 0d787f5..ab5a723 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:
 
@@ -96,9 +95,9 @@ ld-options:
          , "-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,16 +133,16 @@ ld-options:
          , "-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