projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-03-08 04:45:29 by wolfgang]
[ghc-hetmet.git]
/
ghc
/
rts
/
package.conf.in
diff --git
a/ghc/rts/package.conf.in
b/ghc/rts/package.conf.in
index
24b3df9
..
6666863
100644
(file)
--- a/
ghc/rts/package.conf.in
+++ b/
ghc/rts/package.conf.in
@@
-16,27
+16,27
@@
import-dirs:
#ifdef INSTALLING
library-dirs: LIB_DIR
#ifdef INSTALLING
library-dirs: LIB_DIR
-# ifdef mingw32_TARGET_OS
+# ifdef mingw32_HOST_OS
, LIB_DIR"/gcc-lib"
/* force the dist-provided gcc-lib/ into scope. */
# endif
#else /* !INSTALLING */
library-dirs: FPTOOLS_TOP_ABS"/ghc/rts"
, LIB_DIR"/gcc-lib"
/* force the dist-provided gcc-lib/ into scope. */
# endif
#else /* !INSTALLING */
library-dirs: FPTOOLS_TOP_ABS"/ghc/rts"
-# ifndef HAVE_LIBGMP
+# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
, FPTOOLS_TOP_ABS"/ghc/rts/gmp"
# endif
#endif
hs-libraries: "HSrts"
, FPTOOLS_TOP_ABS"/ghc/rts/gmp"
# endif
#endif
hs-libraries: "HSrts"
-extra-libs: "m" /* for ldexp() */
-#ifndef HAVE_FRAMEWORK_HASKELLSUPPORT
+extra-libraries: "m" /* for ldexp() */
+#ifndef HAVE_FRAMEWORK_GMP
, "gmp"
#ifdef HAVE_LIBDL
, "dl"
#endif
#endif
, "gmp"
#ifdef HAVE_LIBDL
, "dl"
#endif
#endif
-#ifdef mingw32_TARGET_OS
+#ifdef mingw32_HOST_OS
,"wsock32" /* for the linker */
#endif
#ifdef WANT_DOTNET_SUPPORT
,"wsock32" /* for the linker */
#endif
#ifdef WANT_DOTNET_SUPPORT
@@
-53,7
+53,7
@@
extra-libs: "m" /* for ldexp() */
#ifdef INSTALLING
include-dirs: INCLUDE_DIR
#ifdef INSTALLING
include-dirs: INCLUDE_DIR
-# ifdef mingw32_TARGET_OS
+# ifdef mingw32_HOST_OS
, INCLUDE_DIR"/mingw"
# endif
#else /* !INSTALLING */
, INCLUDE_DIR"/mingw"
# endif
#else /* !INSTALLING */
@@
-62,10
+62,10
@@
include-dirs: FPTOOLS_TOP_ABS"/ghc/includes"
includes: Stg.h
depends:
includes: Stg.h
depends:
-extra-hugs-opts:
-extra-cc-opts:
+hugs-options:
+cc-options:
-extra-ld-opts:
+ld-options:
#ifdef LEADING_UNDERSCORE
"-u", "_GHCziBase_Izh_static_info"
, "-u", "_GHCziBase_Czh_static_info"
#ifdef LEADING_UNDERSCORE
"-u", "_GHCziBase_Izh_static_info"
, "-u", "_GHCziBase_Czh_static_info"
@@
-138,10
+138,10
@@
extra-ld-opts:
framework-dirs:
framework-dirs:
-#ifdef HAVE_FRAMEWORK_HASKELLSUPPORT
-extra-frameworks: "HaskellSupport"
+#ifdef HAVE_FRAMEWORK_GMP
+frameworks: "GMP"
#else
#else
-extra-frameworks:
+frameworks:
#endif
haddock-interfaces:
#endif
haddock-interfaces: