projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove fgl from extralibs
[ghc-hetmet.git]
/
rts
/
package.conf.in
diff --git
a/rts/package.conf.in
b/rts/package.conf.in
index
1642101
..
557bb99
100644
(file)
--- a/
rts/package.conf.in
+++ b/
rts/package.conf.in
@@
-15,21
+15,23
@@
hidden-modules:
import-dirs:
#ifdef INSTALLING
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 */
# 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
+library-dirs: FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
, FPTOOLS_TOP_ABS"/gmp"
# endif
# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
, 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
@@
-56,12
+58,9
@@
extra-libraries: "m" /* for ldexp() */
#if USE_PAPI
, "papi"
#endif
#if USE_PAPI
, "papi"
#endif
-#ifdef USE_LIBFFI
- , "ffi"
-#endif
#ifdef INSTALLING
#ifdef INSTALLING
-include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS
+include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
# ifdef mingw32_HOST_OS
, INCLUDE_DIR"/mingw"
# endif
# ifdef mingw32_HOST_OS
, INCLUDE_DIR"/mingw"
# endif