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

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 0d787f5..2c9d7b4 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:
 
@@ -143,7 +142,7 @@ ld-options:
  *  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