X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=2c9d7b4eb1f325872f7608f37164e22b0b5df32e;hb=efee3ecf26da95178b773ed68f33601e3fea2c23;hp=131f1e389b8b8921ce7ac7b0d23849b155a53720;hpb=3501ac6af749ada0afcaf84f112ab2e4bf9120b9;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 131f1e3..2c9d7b4 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -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
@@ -99,14 +98,6 @@ ld-options:
 	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
 	 , "-u", "_base_GHCziConc_runSparks_closure"
 	 , "-u", "_base_GHCziConc_runHandlers_closure"
-         , "-u", "_base_GHCziConc_pendingDelays_closure"
-         , "-u", "_base_GHCziConc_pendingEvents_closure"
-         , "-u", "_base_GHCziConc_ioManagerThread_closure"
-#if !defined(mingw32_HOST_OS)
-         , "-u", "_base_GHCziConc_prodding_closure"
-         , "-u", "_base_GHCziConc_sync_closure"
-         , "-u", "_base_GHCziConc_stick_closure"
-#endif
 #else
            "-u", "ghczmprim_GHCziTypes_Izh_static_info"
          , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@ -145,21 +136,13 @@ ld-options:
 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
 	 , "-u", "base_GHCziConc_runSparks_closure"
 	 , "-u", "base_GHCziConc_runHandlers_closure"
-         , "-u", "base_GHCziConc_pendingDelays_closure"
-         , "-u", "base_GHCziConc_pendingEvents_closure"
-         , "-u", "base_GHCziConc_ioManagerThread_closure"
-#if !defined(mingw32_HOST_OS)
-         , "-u", "base_GHCziConc_prodding_closure"
-         , "-u", "base_GHCziConc_sync_closure"
-         , "-u", "base_GHCziConc_stick_closure"
-#endif
 #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