X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fpackage.conf.in;h=eedbfc14dd401212a4ebe7f00330bc409b9df765;hb=74df0d16d17647ab46344802ed57533d38727479;hp=bd26627ea20da10441a3c1d3bea02020b5e578d1;hpb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;p=ghc-hetmet.git

diff --git a/ghc/rts/package.conf.in b/ghc/rts/package.conf.in
index bd26627..eedbfc1 100644
--- a/ghc/rts/package.conf.in
+++ b/ghc/rts/package.conf.in
@@ -22,15 +22,15 @@ 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
 
 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"
@@ -62,10 +62,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"
@@ -99,7 +99,6 @@ extra-ld-opts:
          , "-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 @@ extra-ld-opts:
          , "-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: