X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=54f3b27543efd78a0018f5f41c1812780de83f1c;hb=a99906e5272be7c6212327a32c83eac0a9b08b4b;hp=b46c3d78f57d544e38791f291dbce29d073c3006;hpb=a02af18d636faf850672451131d5264bcbeda796;p=ghc-hetmet.git diff --git a/rts/package.conf.in b/rts/package.conf.in index b46c3d7..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 @@ -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 +library-dirs: TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR # if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) - , FPTOOLS_TOP_ABS"/gmp" + , TOP"/gmp" # endif #endif @@ -60,10 +60,9 @@ 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" +include-dirs: TOP"/includes" # if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP) - FPTOOLS_TOP_ABS"/gmp/gmpbuild" + TOP"/gmp/gmpbuild" # endif GMP_INCLUDE_DIRS #endif @@ -111,6 +110,7 @@ ld-options: , "-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" @@ -148,6 +148,7 @@ ld-options: , "-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