From: simonmar <unknown>
Date: Tue, 24 Feb 2004 17:37:11 +0000 (+0000)
Subject: [project @ 2004-02-24 17:37:11 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~70
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ca5376402b641c1ae20967991e5f2799486a4b44

[project @ 2004-02-24 17:37:11 by simonmar]
wibble to previous commit; forgot to save my buffer
---

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index 341f36b..33f6791 100644
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -3,13 +3,7 @@
 
 /* The RTS is just another package! */
 Package {
-#ifdef THREADED_RTS
-	name           = "rts_thr",
-#elif defined(DEBUG)
-	name           = "rts_debug",
-#else
 	name           = "rts",
-#endif
         import_dirs    = [],
         source_dirs    = [],
 
@@ -27,13 +21,7 @@ Package {
 #endif
 			  ],
 
-#ifdef THREADED_RTS
-        hs_libraries      = [ "HSrts_thr" ],
-#elif defined(DEBUG)
-        hs_libraries      = [ "HSrts_debug" ],
-#else
         hs_libraries      = [ "HSrts" ],
-#endif
 	extra_libraries   = [
 			    "m"		/* for ldexp() */
 #ifndef HAVE_FRAMEWORK_HASKELLSUPPORT
@@ -56,12 +44,6 @@ Package {
                               ,"mingwex"
 # endif
 #endif
-#if defined(THREADED_RTS) && !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
-			      ,"pthread"
-# ifdef osf3_TARGET_OS
-			      ,"exc"
-# endif
-#endif
 			    ],
 
 #ifdef INSTALLING
@@ -77,11 +59,7 @@ Package {
         c_includes     = [ "Stg.h" ],
         package_deps   = [],
         extra_ghc_opts = [],
-#if defined(THREADED_RTS) && defined(freebsd_TARGET_OS)
-        extra_cc_opts  = [ "-pthread" ],
-#else
         extra_cc_opts  = [],
-#endif
                /* the RTS forward-references to a bunch of stuff in the prelude,
                   so we force it to be included with special options to ld. */
         extra_ld_opts  =
@@ -153,9 +131,6 @@ Package {
          , "-u", "GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "__stginit_Prelude"
 #endif
-#if defined(THREADED_RTS) && defined(freebsd_TARGET_OS)
-	 , "-pthread"
-#endif
          ]
 #ifdef HAVE_FRAMEWORK_HASKELLSUPPORT
         , extra_frameworks  = [ "HaskellSupport" ]