[project @ 2003-06-24 12:56:43 by stolz]

FreeBSD Threaded-RTS wibbles (-pthread in {C,LD}FLAGS)

diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs
index 93ac6b7..0e22c01 100644 (file)
--- a/ghc/compiler/main/DriverState.hs
+++ b/ghc/compiler/main/DriverState.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.92 2003/06/23 10:35:17 simonpj Exp $
+-- $Id: DriverState.hs,v 1.93 2003/06/24 12:56:44 stolz Exp $
 --
 -- Settings for the driver
 --
@@ -780,7 +780,9 @@ way_details =
     (WaySMP, Way  "s" "SMP"
        [ "-fsmp"
        , "-optc-pthread"
+#ifndef freebsd_TARGET_OS
        , "-optl-pthread"
+#endif
        , "-optc-DSMP"
        , "-fvia-C" ]),
 

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index 3a31625..ac11847 100644 (file)
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -43,7 +43,7 @@ Package {
                               ,"mingwex"
 # endif
 #endif
-#if defined(THREADED_RTS) && !defined(mingw32_TARGET_OS)
+#if defined(THREADED_RTS) && !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
                              ,"pthread"
 # ifdef osf3_TARGET_OS
                              ,"exc"
@@ -64,7 +64,11 @@ 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  =
@@ -136,6 +140,9 @@ 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" ]