projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1779 and qq005: export hs_hpc_module
[ghc-hetmet.git]
/
rts
/
package.conf.in
diff --git
a/rts/package.conf.in
b/rts/package.conf.in
index
bae12f8
..
490222f
100644
(file)
--- a/
rts/package.conf.in
+++ b/
rts/package.conf.in
@@
-22,16
+22,14
@@
library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
# endif
#else /* !INSTALLING */
library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
# endif
#else /* !INSTALLING */
library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
, FPTOOLS_TOP_ABS"/gmp"
# endif
, FPTOOLS_TOP_ABS"/gmp"
# endif
- , FPTOOLS_TOP_ABS"/libffi"
#endif
hs-libraries: "HSrts"
extra-libraries: "m" /* for ldexp() */
#endif
hs-libraries: "HSrts"
extra-libraries: "m" /* for ldexp() */
- , "ffi"
#ifndef HAVE_FRAMEWORK_GMP
, "gmp"
#ifdef HAVE_LIBDL
#ifndef HAVE_FRAMEWORK_GMP
, "gmp"
#ifdef HAVE_LIBDL
@@
-61,18
+59,16
@@
extra-libraries: "m" /* for ldexp() */
#ifdef INSTALLING
include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
#ifdef INSTALLING
include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
-# ifdef mingw32_HOST_OS
- , INCLUDE_DIR"/mingw"
-# endif
#else /* !INSTALLING */
include-dirs: FPTOOLS_TOP_ABS"/includes"
#else /* !INSTALLING */
include-dirs: FPTOOLS_TOP_ABS"/includes"
- FPTOOLS_TOP_ABS"/rts"
+# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
FPTOOLS_TOP_ABS"/gmp/gmpbuild"
FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+# endif
GMP_INCLUDE_DIRS
#endif
includes: Stg.h
GMP_INCLUDE_DIRS
#endif
includes: Stg.h
-depends:
+depends: ffi-1.0
hugs-options:
cc-options:
hugs-options:
cc-options:
@@
-112,6
+108,9
@@
ld-options:
, "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
, "-u", "_base_GHCziTopHandler_runIO_closure"
, "-u", "_base_GHCziTopHandler_runNonIO_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"
#else
"-u", "ghczmprim_GHCziTypes_Izh_static_info"
, "-u", "ghczmprim_GHCziTypes_Czh_static_info"
@@
-147,12
+146,9
@@
ld-options:
, "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
, "-u", "base_GHCziTopHandler_runIO_closure"
, "-u", "base_GHCziTopHandler_runNonIO_closure"
, "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
, "-u", "base_GHCziTopHandler_runIO_closure"
, "-u", "base_GHCziTopHandler_runNonIO_closure"
-#endif
-
-#ifdef LEADING_UNDERSCORE
- , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
-#else
, "-u", "base_GHCziConc_ensureIOManagerIsRunning_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
#endif
/* Pick up static libraries in preference over dynamic if in earlier search
@@
-163,6
+159,10
@@
ld-options:
, "-Wl,-search_paths_first"
#endif
, "-Wl,-search_paths_first"
#endif
+#ifdef darwin_HOST_OS
+ , "-read_only_relocs", "warning"
+#endif
+
framework-dirs:
#ifdef HAVE_FRAMEWORK_GMP
framework-dirs:
#ifdef HAVE_FRAMEWORK_GMP