X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fpackage.conf.in;h=e1af3413b1aa17da0fc64a876b00a088c6bf46b6;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=ac11847cefe696df5f3ec2fd44386e1e135420b9;hpb=3251d5d3cc01a8391f37f99fc455a9a6ef1688e1;p=ghc-hetmet.git

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index ac11847..e1af341 100644
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -1,8 +1,9 @@
-#include "config.h"
-#include "Derived.h"
+#include "ghcconfig.h"
+#include "RtsConfig.h"
 
+/* The RTS is just another package! */
 Package {
-	name           = "rts",  /* The RTS is just another package! */
+	name           = "rts",
         import_dirs    = [],
         source_dirs    = [],
 
@@ -43,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
@@ -64,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  =
@@ -140,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" ]