X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=d10ed0dfa2189b963a29e96274df96e83c11e31c;hb=342c32deb5176483dfce3befbd68893740df857e;hp=318f4ed0157aa9b5a0829fd1910c46ec7550cc4a;hpb=2b16fa4791b08b02df8461f3b79d0e44d72d0960;p=ghc-hetmet.git diff --git a/rts/package.conf.in b/rts/package.conf.in index 318f4ed..d10ed0d 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 @@ -21,9 +21,9 @@ library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR /* force the dist-provided gcc-lib/ into scope. */ # endif #else /* !INSTALLING */ -library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR -# 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 @@ -60,9 +60,10 @@ extra-libraries: "m" /* for ldexp() */ #ifdef INSTALLING 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 @@ -98,17 +99,18 @@ ld-options: , "-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_GHCziIOziException_stackOverflow_closure" + , "-u", "_base_GHCziIOziException_heapOverflow_closure" , "-u", "_base_ControlziExceptionziBase_nonTermination_closure" - , "-u", "_base_GHCziIOBase_blockedOnDeadMVar_closure" - , "-u", "_base_GHCziIOBase_blockedIndefinitely_closure" + , "-u", "_base_GHCziIOziException_blockedOnDeadMVar_closure" + , "-u", "_base_GHCziIOziException_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", "ghczmprim_GHCziTypes_Izh_static_info" , "-u", "ghczmprim_GHCziTypes_Czh_static_info" @@ -135,17 +137,18 @@ ld-options: , "-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_GHCziIOziException_stackOverflow_closure" + , "-u", "base_GHCziIOziException_heapOverflow_closure" , "-u", "base_ControlziExceptionziBase_nonTermination_closure" - , "-u", "base_GHCziIOBase_blockedOnDeadMVar_closure" - , "-u", "base_GHCziIOBase_blockedIndefinitely_closure" + , "-u", "base_GHCziIOziException_blockedOnDeadMVar_closure" + , "-u", "base_GHCziIOziException_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 /* Pick up static libraries in preference over dynamic if in earlier search @@ -156,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