X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=54f3b27543efd78a0018f5f41c1812780de83f1c;hb=80d071f68134bf3ad89d4de0d83807e2f0ec32c0;hp=0ccdb3ca5237613f4af4c8e696cc835223a5b6cc;hpb=07be901da936ec4a503a514b02c6d247f533b963;p=ghc-hetmet.git diff --git a/rts/package.conf.in b/rts/package.conf.in index 0ccdb3c..54f3b27 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -3,7 +3,7 @@ #include "ghcconfig.h" #include "RtsConfig.h" -name: PACKAGE +name: rts version: 1.0 license: BSD3 maintainer: glasgow-haskell-users@haskell.org @@ -15,15 +15,15 @@ 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" -# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP) - , FPTOOLS_TOP_ABS"/rts/gmp" +library-dirs: TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR +# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) + , TOP"/gmp" # endif #endif @@ -58,25 +58,26 @@ extra-libraries: "m" /* for ldexp() */ #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" +include-dirs: TOP"/includes" +# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) + TOP"/gmp/gmpbuild" +# endif + GMP_INCLUDE_DIRS #endif includes: Stg.h -depends: +depends: ffi-1.0 hugs-options: 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" @@ -88,29 +89,33 @@ 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" + , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "_base_GHCziConc_runSparks_closure" + , "-u", "_base_GHCziConc_runHandlers_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" @@ -122,30 +127,40 @@ 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" + , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" + , "-u", "base_GHCziConc_runSparks_closure" + , "-u", "base_GHCziConc_runHandlers_closure" #endif -#ifdef LEADING_UNDERSCORE - , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" -#else - , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" +/* 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 + +#ifdef darwin_HOST_OS + , "-read_only_relocs", "warning" #endif framework-dirs: