projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a #endif back that was accidentally removed from package.conf.in
[ghc-hetmet.git]
/
rts
/
package.conf.in
diff --git
a/rts/package.conf.in
b/rts/package.conf.in
index
d10ed0d
..
a49cee6
100644
(file)
--- a/
rts/package.conf.in
+++ b/
rts/package.conf.in
@@
-15,27
+15,18
@@
hidden-modules:
import-dirs:
#ifdef INSTALLING
import-dirs:
#ifdef INSTALLING
-library-dirs: LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
+library-dirs: LIB_DIR 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: TOP"/rts/dist/build" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
- , TOP"/gmp"
-# endif
+library-dirs: TOP"/rts/dist/build" PAPI_LIB_DIR
#endif
hs-libraries: "HSrts"
extra-libraries: "m" /* for ldexp() */
#endif
hs-libraries: "HSrts"
extra-libraries: "m" /* for ldexp() */
-#ifndef HAVE_FRAMEWORK_GMP
- , "gmp"
-#ifdef HAVE_LIBDL
- , "dl"
-#endif
-#endif
#ifdef HAVE_LIBRT
, "rt"
#endif
#ifdef HAVE_LIBRT
, "rt"
#endif
@@
-58,13
+49,9
@@
extra-libraries: "m" /* for ldexp() */
#endif
#ifdef INSTALLING
#endif
#ifdef INSTALLING
-include-dirs: INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
+include-dirs: INCLUDE_DIR PAPI_INCLUDE_DIR
#else /* !INSTALLING */
include-dirs: TOP"/includes"
#else /* !INSTALLING */
include-dirs: TOP"/includes"
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
- TOP"/gmp/gmpbuild"
-# endif
- GMP_INCLUDE_DIRS
#endif
includes: Stg.h
#endif
includes: Stg.h
@@
-165,12
+152,6
@@
ld-options:
framework-dirs:
framework-dirs:
-#ifdef HAVE_FRAMEWORK_GMP
-frameworks: "GMP"
-#else
-frameworks:
-#endif
-
haddock-interfaces:
haddock-html:
haddock-interfaces:
haddock-html: