X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rts%2Fpackage.conf.in;h=318f4ed0157aa9b5a0829fd1910c46ec7550cc4a;hb=63179a7b10069d8f69f5bceef27008c9c7fb0aa8;hp=1b274c9d694509381a6188b3b8634344881f3d09;hpb=371fe43219d9dbc6faf15d01ea921a40294e181e;p=ghc-hetmet.git diff --git a/rts/package.conf.in b/rts/package.conf.in index 1b274c9..318f4ed 100644 --- 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 @@ -69,7 +67,7 @@ include-dirs: FPTOOLS_TOP_ABS"/includes" #endif includes: Stg.h -depends: +depends: ffi-1.0 hugs-options: cc-options: @@ -109,6 +107,8 @@ ld-options: , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure" , "-u", "_base_GHCziTopHandler_runIO_closure" , "-u", "_base_GHCziTopHandler_runNonIO_closure" + , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "_base_GHCziConc_runSparks_closure" #else "-u", "ghczmprim_GHCziTypes_Izh_static_info" , "-u", "ghczmprim_GHCziTypes_Czh_static_info" @@ -144,12 +144,8 @@ ld-options: , "-u", "base_GHCziWeak_runFinalizzerBatch_closure" , "-u", "base_GHCziTopHandler_runIO_closure" , "-u", "base_GHCziTopHandler_runNonIO_closure" -#endif - -#ifdef LEADING_UNDERSCORE - , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" -#else , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "base_GHCziConc_runSparks_closure" #endif /* Pick up static libraries in preference over dynamic if in earlier search