X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Frts.conf.in;h=4230e14a711e3abae17deee329a2ac31345abd1b;hb=9c383315203f0ad7cfd65272d04d921c0cef3cec;hp=c4e1c3f80cdd8d6a40799c765ad2434d5d676e8c;hpb=c2320f07c72f9e7322723ede5f6c68b869844699;p=ghc-hetmet.git

diff --git a/ghc/rts/rts.conf.in b/ghc/rts/rts.conf.in
index c4e1c3f..4230e14 100644
--- a/ghc/rts/rts.conf.in
+++ b/ghc/rts/rts.conf.in
@@ -21,15 +21,26 @@ Package {
 			  ],
 
         hs_libraries      = [ "HSrts" ],
-	extra_libraries   = [ "gmp"
-			    , "m"		/* for ldexp() */
+	extra_libraries   = [
+			    "m"		/* for ldexp() */
+#ifndef HAVE_FRAMEWORK_HASKELLSUPPORT
+			      , "gmp"
+#ifdef HAVE_LIBDL
+			      , "dl"
+#endif
+#endif
 #ifdef mingw32_TARGET_OS
 			      ,"winmm"		/* for the threadDelay timer */
 			      ,"wsock32"	/* for the linker */
 #endif
-#ifdef USING_LIBBFD
+#if defined(DEBUG) && defined(HAVE_LIBBFD)
 			      ,"bfd", "iberty"	/* for debugging */
 #endif
+#ifdef HAVE_LIBMINGWEX
+# ifndef INSTALLING                             /* Bundled Mingw is behind */
+                              ,"mingwex"
+# endif
+#endif
 #if defined(THREADED_RTS) && !defined(mingw32_TARGET_OS)
 			      ,"pthread"
 # ifdef osf3_TARGET_OS
@@ -122,4 +133,7 @@ Package {
          , "-u", "__stginit_Prelude"
 #endif
          ]
+#ifdef HAVE_FRAMEWORK_HASKELLSUPPORT
+        , extra_frameworks  = [ "HaskellSupport" ]
+#endif
 }