X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2Fpackage.conf.in;h=2550415e5abacbe35335d7537e60337eeb317cc9;hb=1f5e3b2472084434edf71a89c4764d1509e8e9b0;hp=764b0f849036e706bceec70ea8fa9531fd26cf46;hpb=a039f52aeb452d291305919a88b675d6eb1819c0;p=ghc-hetmet.git

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index 764b0f8..2550415 100644
--- 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,12 +30,15 @@ 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"
 #endif
 #endif
+#ifdef HAVE_LIBRT
+			      , "rt"
+#endif
 #ifdef mingw32_HOST_OS
 			      ,"wsock32"	/* for the linker */
 #endif
@@ -62,8 +65,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
@@ -98,8 +101,8 @@ ld-options:
          , "-u", "_GHCziIOBase_BlockedOnDeadMVar_closure"
          , "-u", "_GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "_GHCziIOBase_Deadlock_closure"
+         , "-u", "_GHCziIOBase_NestedAtomically_closure"
          , "-u", "_GHCziWeak_runFinalizzerBatch_closure"
-         , "-u", "___stginit_Prelude"
 #else
            "-u", "GHCziBase_Izh_static_info"
          , "-u", "GHCziBase_Czh_static_info"
@@ -132,16 +135,16 @@ ld-options:
          , "-u", "GHCziIOBase_BlockedOnDeadMVar_closure"
          , "-u", "GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "GHCziIOBase_Deadlock_closure"
+         , "-u", "GHCziIOBase_NestedAtomically_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: