X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rts%2Fpackage.conf.in;h=54f3b27543efd78a0018f5f41c1812780de83f1c;hb=34cc75e1a62638f2833815746ebce0a9114dc26b;hp=1642101ba0c4f80dc0eb2089d94ef2721f7a6e0c;hpb=fcf6b22d0478be20e27c2245f3e34dd272e12522;p=ghc-hetmet.git diff --git a/rts/package.conf.in b/rts/package.conf.in index 1642101..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 GMP_LIB_DIRS +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" GMP_LIB_DIRS -# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP) - , FPTOOLS_TOP_ABS"/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 @@ -56,33 +56,28 @@ extra-libraries: "m" /* for ldexp() */ #if USE_PAPI , "papi" #endif -#ifdef USE_LIBFFI - , "ffi" -#endif #ifdef INSTALLING -include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS -# 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" +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" @@ -94,10 +89,10 @@ 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" @@ -106,17 +101,21 @@ ld-options: , "-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" @@ -128,10 +127,10 @@ 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" @@ -140,18 +139,16 @@ ld-options: , "-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" -#endif - -#ifdef LEADING_UNDERSCORE - , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" -#else + , "-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 /* Pick up static libraries in preference over dynamic if in earlier search @@ -162,6 +159,10 @@ ld-options: , "-Wl,-search_paths_first" #endif +#ifdef darwin_HOST_OS + , "-read_only_relocs", "warning" +#endif + framework-dirs: #ifdef HAVE_FRAMEWORK_GMP