Clean the bootstrapping extensible-exceptions package

[ghc-hetmet.git] / rts / package.conf.in

diff --git a/rts/package.conf.in b/rts/package.conf.in
index bac7883..e869d9c 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -25,13 +25,11 @@ library-dirs:               FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
 # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
                        , FPTOOLS_TOP_ABS"/gmp"
 # endif
-                        , FPTOOLS_TOP_ABS"/libffi"
 #endif
 
 hs-libraries:   "HSrts"
 
 extra-libraries:               "m"             /* for ldexp() */
-                             , "ffi"
 #ifndef HAVE_FRAMEWORK_GMP
                              , "gmp"
 #ifdef HAVE_LIBDL
@@ -61,9 +59,6 @@ extra-libraries:              "m"             /* for ldexp() */
 
 #ifdef INSTALLING
 include-dirs:          INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
-# ifdef mingw32_HOST_OS
-                       , INCLUDE_DIR"/mingw"
-# endif
 #else /* !INSTALLING */
 include-dirs:          FPTOOLS_TOP_ABS"/includes"
                        FPTOOLS_TOP_ABS"/rts"
@@ -72,7 +67,7 @@ include-dirs:         FPTOOLS_TOP_ABS"/includes"
 #endif
 
 includes:              Stg.h
-depends:               
+depends:               ffi-1.0
 hugs-options:
 cc-options:
 
@@ -106,11 +101,12 @@ ld-options:
          , "-u", "_base_GHCziIOBase_stackOverflow_closure"
          , "-u", "_base_GHCziIOBase_heapOverflow_closure"
          , "-u", "_base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "_base_GHCziIOBase_BlockedOnDeadMVar_closure"
-         , "-u", "_base_GHCziIOBase_BlockedIndefinitely_closure"
-         , "-u", "_base_GHCziIOBase_Deadlock_closure"
+         , "-u", "_base_GHCziIOBase_blockedOnDeadMVar_closure"
+         , "-u", "_base_GHCziIOBase_blockedIndefinitely_closure"
          , "-u", "_base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
+         , "-u", "_base_GHCziTopHandler_runIO_closure"
+         , "-u", "_base_GHCziTopHandler_runNonIO_closure"
 #else
            "-u", "ghczmprim_GHCziTypes_Izh_static_info"
          , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@ -140,11 +136,12 @@ ld-options:
          , "-u", "base_GHCziIOBase_stackOverflow_closure"
          , "-u", "base_GHCziIOBase_heapOverflow_closure"
          , "-u", "base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "base_GHCziIOBase_BlockedOnDeadMVar_closure"
-         , "-u", "base_GHCziIOBase_BlockedIndefinitely_closure"
-         , "-u", "base_GHCziIOBase_Deadlock_closure"
+         , "-u", "base_GHCziIOBase_blockedOnDeadMVar_closure"
+         , "-u", "base_GHCziIOBase_blockedIndefinitely_closure"
          , "-u", "base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
+         , "-u", "base_GHCziTopHandler_runIO_closure"
+         , "-u", "base_GHCziTopHandler_runNonIO_closure"
 #endif
 
 #ifdef LEADING_UNDERSCORE