X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fpackage.conf.in;h=2550415e5abacbe35335d7537e60337eeb317cc9;hb=1f5e3b2472084434edf71a89c4764d1509e8e9b0;hp=24b3df90458f27ac08abd8f3c386a689ed93533f;hpb=73ef81cb72ebde9c2614000c0a306ba6405689ae;p=ghc-hetmet.git

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index 24b3df9..2550415 100644
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -16,27 +16,30 @@ import-dirs:
 
 #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"
-# ifndef HAVE_LIBGMP
+# if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
 			, 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
-#ifdef mingw32_TARGET_OS
+#ifdef HAVE_LIBRT
+			      , "rt"
+#endif
+#ifdef mingw32_HOST_OS
 			      ,"wsock32"	/* for the linker */
 #endif
 #ifdef WANT_DOTNET_SUPPORT
@@ -53,7 +56,7 @@ extra-libs:		"m"		/* for ldexp() */
 
 #ifdef INSTALLING
 include-dirs:		INCLUDE_DIR
-# ifdef mingw32_TARGET_OS
+# ifdef mingw32_HOST_OS
 			, INCLUDE_DIR"/mingw"
 # endif
 #else /* !INSTALLING */
@@ -62,10 +65,10 @@ include-dirs:		FPTOOLS_TOP_ABS"/ghc/includes"
 
 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"
@@ -98,8 +101,8 @@ extra-ld-opts:
          , "-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 @@ extra-ld-opts:
          , "-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: