X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=1b274c9d694509381a6188b3b8634344881f3d09;hp=5b75be92bf3b9e8ba7cb3620f1ad5e2ecf76f4cc;hb=371fe43219d9dbc6faf15d01ea921a40294e181e;hpb=e7d4b777a1667ccd6912115d43272c3735316eea diff --git a/rts/package.conf.in b/rts/package.conf.in index 5b75be9..1b274c9 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -15,21 +15,23 @@ hidden-modules: import-dirs: #ifdef INSTALLING -library-dirs: LIB_DIR +library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR # ifdef mingw32_HOST_OS , LIB_DIR"/gcc-lib" /* force the dist-provided gcc-lib/ into scope. */ # endif #else /* !INSTALLING */ -library-dirs: FPTOOLS_TOP_ABS"/rts" +library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP) - , FPTOOLS_TOP_ABS"/rts/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 @@ -53,14 +55,17 @@ extra-libraries: "m" /* for ldexp() */ ,"mingwex" # endif #endif +#if USE_PAPI + , "papi" +#endif #ifdef INSTALLING -include-dirs: INCLUDE_DIR -# ifdef mingw32_HOST_OS - , INCLUDE_DIR"/mingw" -# endif +include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR #else /* !INSTALLING */ include-dirs: FPTOOLS_TOP_ABS"/includes" + FPTOOLS_TOP_ABS"/rts" + FPTOOLS_TOP_ABS"/gmp/gmpbuild" + GMP_INCLUDE_DIRS #endif includes: Stg.h @@ -70,10 +75,10 @@ cc-options: ld-options: #ifdef LEADING_UNDERSCORE - "-u", "_base_GHCziBase_Izh_static_info" - , "-u", "_base_GHCziBase_Czh_static_info" - , "-u", "_base_GHCziFloat_Fzh_static_info" - , "-u", "_base_GHCziFloat_Dzh_static_info" + "-u", "_ghczmprim_GHCziTypes_Izh_static_info" + , "-u", "_ghczmprim_GHCziTypes_Czh_static_info" + , "-u", "_ghczmprim_GHCziTypes_Fzh_static_info" + , "-u", "_ghczmprim_GHCziTypes_Dzh_static_info" , "-u", "_base_GHCziPtr_Ptr_static_info" , "-u", "_base_GHCziWord_Wzh_static_info" , "-u", "_base_GHCziInt_I8zh_static_info" @@ -85,29 +90,30 @@ ld-options: , "-u", "_base_GHCziWord_W32zh_static_info" , "-u", "_base_GHCziWord_W64zh_static_info" , "-u", "_base_GHCziStable_StablePtr_static_info" - , "-u", "_base_GHCziBase_Izh_con_info" - , "-u", "_base_GHCziBase_Czh_con_info" - , "-u", "_base_GHCziFloat_Fzh_con_info" - , "-u", "_base_GHCziFloat_Dzh_con_info" + , "-u", "_ghczmprim_GHCziTypes_Izh_con_info" + , "-u", "_ghczmprim_GHCziTypes_Czh_con_info" + , "-u", "_ghczmprim_GHCziTypes_Fzh_con_info" + , "-u", "_ghczmprim_GHCziTypes_Dzh_con_info" , "-u", "_base_GHCziPtr_Ptr_con_info" , "-u", "_base_GHCziPtr_FunPtr_con_info" , "-u", "_base_GHCziStable_StablePtr_con_info" - , "-u", "_base_GHCziBase_False_closure" - , "-u", "_base_GHCziBase_True_closure" + , "-u", "_ghczmprim_GHCziBool_False_closure" + , "-u", "_ghczmprim_GHCziBool_True_closure" , "-u", "_base_GHCziPack_unpackCString_closure" , "-u", "_base_GHCziIOBase_stackOverflow_closure" , "-u", "_base_GHCziIOBase_heapOverflow_closure" - , "-u", "_base_GHCziIOBase_NonTermination_closure" - , "-u", "_base_GHCziIOBase_BlockedOnDeadMVar_closure" - , "-u", "_base_GHCziIOBase_BlockedIndefinitely_closure" - , "-u", "_base_GHCziIOBase_Deadlock_closure" - , "-u", "_base_GHCziIOBase_NestedAtomically_closure" + , "-u", "_base_ControlziExceptionziBase_nonTermination_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", "base_GHCziBase_Izh_static_info" - , "-u", "base_GHCziBase_Czh_static_info" - , "-u", "base_GHCziFloat_Fzh_static_info" - , "-u", "base_GHCziFloat_Dzh_static_info" + "-u", "ghczmprim_GHCziTypes_Izh_static_info" + , "-u", "ghczmprim_GHCziTypes_Czh_static_info" + , "-u", "ghczmprim_GHCziTypes_Fzh_static_info" + , "-u", "ghczmprim_GHCziTypes_Dzh_static_info" , "-u", "base_GHCziPtr_Ptr_static_info" , "-u", "base_GHCziWord_Wzh_static_info" , "-u", "base_GHCziInt_I8zh_static_info" @@ -119,32 +125,39 @@ ld-options: , "-u", "base_GHCziWord_W32zh_static_info" , "-u", "base_GHCziWord_W64zh_static_info" , "-u", "base_GHCziStable_StablePtr_static_info" - , "-u", "base_GHCziBase_Izh_con_info" - , "-u", "base_GHCziBase_Czh_con_info" - , "-u", "base_GHCziFloat_Fzh_con_info" - , "-u", "base_GHCziFloat_Dzh_con_info" + , "-u", "ghczmprim_GHCziTypes_Izh_con_info" + , "-u", "ghczmprim_GHCziTypes_Czh_con_info" + , "-u", "ghczmprim_GHCziTypes_Fzh_con_info" + , "-u", "ghczmprim_GHCziTypes_Dzh_con_info" , "-u", "base_GHCziPtr_Ptr_con_info" , "-u", "base_GHCziPtr_FunPtr_con_info" , "-u", "base_GHCziStable_StablePtr_con_info" - , "-u", "base_GHCziBase_False_closure" - , "-u", "base_GHCziBase_True_closure" + , "-u", "ghczmprim_GHCziBool_False_closure" + , "-u", "ghczmprim_GHCziBool_True_closure" , "-u", "base_GHCziPack_unpackCString_closure" , "-u", "base_GHCziIOBase_stackOverflow_closure" , "-u", "base_GHCziIOBase_heapOverflow_closure" - , "-u", "base_GHCziIOBase_NonTermination_closure" - , "-u", "base_GHCziIOBase_BlockedOnDeadMVar_closure" - , "-u", "base_GHCziIOBase_BlockedIndefinitely_closure" - , "-u", "base_GHCziIOBase_Deadlock_closure" - , "-u", "base_GHCziIOBase_NestedAtomically_closure" + , "-u", "base_ControlziExceptionziBase_nonTermination_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 -#ifndef mingw32_HOST_OS #ifdef LEADING_UNDERSCORE - , "-u", "_GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" #else - , "-u", "GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" #endif + +/* Pick up static libraries in preference over dynamic if in earlier search + * path. This is important to use the static gmp in preference on Mac OS. + * The used option is specific to the Darwin linker. + */ +#ifdef darwin_BUILD_OS + , "-Wl,-search_paths_first" #endif framework-dirs: