[project @ 2005-04-15 05:29:48 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 764b0f8..eedbfc1 100644 (file)
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -22,7 +22,7 @@ library-dirs:         LIB_DIR
 # 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
@@ -30,7 +30,7 @@ library-dirs:         FPTOOLS_TOP_ABS"/ghc/rts"
 hs-libraries:   "HSrts"
 
 extra-libraries:               "m"             /* for ldexp() */
-#ifndef HAVE_FRAMEWORK_HASKELLSUPPORT
+#ifndef HAVE_FRAMEWORK_GMP
                              , "gmp"
 #ifdef HAVE_LIBDL
                              , "dl"
@@ -62,8 +62,8 @@ include-dirs:         FPTOOLS_TOP_ABS"/ghc/includes"
 
 includes:              Stg.h
 depends:               
-extra-hugs-opts:
-extra-cc-opts:
+hugs-options:
+cc-options:
 
 ld-options:
 #ifdef LEADING_UNDERSCORE
@@ -99,7 +99,6 @@ ld-options:
          , "-u", "_GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "_GHCziIOBase_Deadlock_closure"
          , "-u", "_GHCziWeak_runFinalizzerBatch_closure"
-         , "-u", "___stginit_Prelude"
 #else
            "-u", "GHCziBase_Izh_static_info"
          , "-u", "GHCziBase_Czh_static_info"
@@ -133,15 +132,14 @@ ld-options:
          , "-u", "GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "GHCziIOBase_Deadlock_closure"
          , "-u", "GHCziWeak_runFinalizzerBatch_closure"
-         , "-u", "__stginit_Prelude"
 #endif
 
 framework-dirs:
 
-#ifdef HAVE_FRAMEWORK_HASKELLSUPPORT
-extra-frameworks:      "HaskellSupport"
+#ifdef HAVE_FRAMEWORK_GMP
+frameworks:    "GMP"
 #else
-extra-frameworks:
+frameworks:
 #endif
 
 haddock-interfaces: