X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=a49cee66770c3390ee3059066e9d01d5ee150ac0;hb=e543f10a733dd08d99f31582a1c53dde2cdd654d;hp=490222fdb974367e10db74bcf37b4b59837b08af;hpb=7ed3f7556f46b957f7efb97ed7ebdc92db2f8ab7;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 490222f..a49cee6 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -3,7 +3,7 @@
 #include "ghcconfig.h"
 #include "RtsConfig.h"
 
-name:		PACKAGE
+name:		rts
 version:	1.0
 license:	BSD3
 maintainer:	glasgow-haskell-users@haskell.org
@@ -15,27 +15,18 @@ hidden-modules:
 import-dirs:
 
 #ifdef INSTALLING
-library-dirs:		LIB_DIR GMP_LIB_DIRS PAPI_LIB_DIR
+library-dirs:		LIB_DIR PAPI_LIB_DIR
 # ifdef mingw32_HOST_OS
 			, LIB_DIR"/gcc-lib"
 			/* force the dist-provided gcc-lib/ into scope. */
 # endif
 #else /* !INSTALLING */
-library-dirs:		FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
-			, FPTOOLS_TOP_ABS"/gmp"
-# endif
+library-dirs:		TOP"/rts/dist/build" PAPI_LIB_DIR
 #endif
 
 hs-libraries:   "HSrts"
 
 extra-libraries:		"m"		/* for ldexp() */
-#ifndef HAVE_FRAMEWORK_GMP
-			      , "gmp"
-#ifdef HAVE_LIBDL
-			      , "dl"
-#endif
-#endif
 #ifdef HAVE_LIBRT
 			      , "rt"
 #endif
@@ -58,13 +49,9 @@ extra-libraries:		"m"		/* for ldexp() */
 #endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
+include-dirs:		INCLUDE_DIR PAPI_INCLUDE_DIR
 #else /* !INSTALLING */
-include-dirs:		FPTOOLS_TOP_ABS"/includes"
-# if !defined(HAVE_LIB_GMP) && !defined(HAVE_FRAMEWORK_GMP)
-             		FPTOOLS_TOP_ABS"/gmp/gmpbuild"
-# endif
-             		GMP_INCLUDE_DIRS
+include-dirs:		TOP"/includes"
 #endif
 
 includes:		Stg.h
@@ -99,11 +86,11 @@ ld-options:
          , "-u", "_ghczmprim_GHCziBool_False_closure"
          , "-u", "_ghczmprim_GHCziBool_True_closure"
          , "-u", "_base_GHCziPack_unpackCString_closure"
-         , "-u", "_base_GHCziIOBase_stackOverflow_closure"
-         , "-u", "_base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "_base_GHCziIOziException_stackOverflow_closure"
+         , "-u", "_base_GHCziIOziException_heapOverflow_closure"
          , "-u", "_base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "_base_GHCziIOBase_blockedOnDeadMVar_closure"
-         , "-u", "_base_GHCziIOBase_blockedIndefinitely_closure"
+         , "-u", "_base_GHCziIOziException_blockedOnDeadMVar_closure"
+         , "-u", "_base_GHCziIOziException_blockedIndefinitely_closure"
          , "-u", "_base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "_base_GHCziTopHandler_runIO_closure"
@@ -137,11 +124,11 @@ ld-options:
          , "-u", "ghczmprim_GHCziBool_False_closure"
          , "-u", "ghczmprim_GHCziBool_True_closure"
          , "-u", "base_GHCziPack_unpackCString_closure"
-         , "-u", "base_GHCziIOBase_stackOverflow_closure"
-         , "-u", "base_GHCziIOBase_heapOverflow_closure"
+         , "-u", "base_GHCziIOziException_stackOverflow_closure"
+         , "-u", "base_GHCziIOziException_heapOverflow_closure"
          , "-u", "base_ControlziExceptionziBase_nonTermination_closure"
-         , "-u", "base_GHCziIOBase_blockedOnDeadMVar_closure"
-         , "-u", "base_GHCziIOBase_blockedIndefinitely_closure"
+         , "-u", "base_GHCziIOziException_blockedOnDeadMVar_closure"
+         , "-u", "base_GHCziIOziException_blockedIndefinitely_closure"
          , "-u", "base_ControlziExceptionziBase_nestedAtomically_closure"
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
          , "-u", "base_GHCziTopHandler_runIO_closure"
@@ -165,12 +152,6 @@ ld-options:
 
 framework-dirs:
 
-#ifdef HAVE_FRAMEWORK_GMP
-frameworks:	"GMP"
-#else
-frameworks:
-#endif
-
 haddock-interfaces:
 haddock-html: