X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=9022d11a431f7939a27f0caee7e5282fa37c9752;hb=27de38efce6d73d2a0209f803cfa98c82773e773;hp=7e0ee020a1b2b6a96898e48cd710055398c42398;hpb=e0fcf61dca4dfac99cb5417e1bc4cbee18822cf2;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 7e0ee02..9022d11 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -15,13 +15,13 @@ hidden-modules:
 import-dirs:
 
 #ifdef INSTALLING
-library-dirs:		LIB_DIR GMP_LIB_DIRS
+library-dirs:		LIB_DIR GMP_LIB_DIRS 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
+library-dirs:		FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS PAPI_LIB_DIR
 # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
 			, FPTOOLS_TOP_ABS"/gmp"
 # endif
@@ -60,7 +60,7 @@ extra-libraries:		"m"		/* for ldexp() */
 #endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
+include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS PAPI_INCLUDE_DIR
 # ifdef mingw32_HOST_OS
 			, INCLUDE_DIR"/mingw"
 # endif
@@ -78,10 +78,10 @@ cc-options:
 
 ld-options:
 #ifdef LEADING_UNDERSCORE
-           "-u", "_base_GHCziBase_Izh_static_info"
-         , "-u", "_base_GHCziBase_Czh_static_info"
-         , "-u", "_base_GHCziFloat_Fzh_static_info"
-         , "-u", "_base_GHCziFloat_Dzh_static_info"
+           "-u", "_ghczmprim_GHCziTypes_Izh_static_info"
+         , "-u", "_ghczmprim_GHCziTypes_Czh_static_info"
+         , "-u", "_ghczmprim_GHCziTypes_Fzh_static_info"
+         , "-u", "_ghczmprim_GHCziTypes_Dzh_static_info"
          , "-u", "_base_GHCziPtr_Ptr_static_info"
          , "-u", "_base_GHCziWord_Wzh_static_info"
          , "-u", "_base_GHCziInt_I8zh_static_info"
@@ -93,10 +93,10 @@ ld-options:
          , "-u", "_base_GHCziWord_W32zh_static_info"
          , "-u", "_base_GHCziWord_W64zh_static_info"
          , "-u", "_base_GHCziStable_StablePtr_static_info"
-         , "-u", "_base_GHCziBase_Izh_con_info"
-         , "-u", "_base_GHCziBase_Czh_con_info"
-         , "-u", "_base_GHCziFloat_Fzh_con_info"
-         , "-u", "_base_GHCziFloat_Dzh_con_info"
+         , "-u", "_ghczmprim_GHCziTypes_Izh_con_info"
+         , "-u", "_ghczmprim_GHCziTypes_Czh_con_info"
+         , "-u", "_ghczmprim_GHCziTypes_Fzh_con_info"
+         , "-u", "_ghczmprim_GHCziTypes_Dzh_con_info"
          , "-u", "_base_GHCziPtr_Ptr_con_info"
          , "-u", "_base_GHCziPtr_FunPtr_con_info"
          , "-u", "_base_GHCziStable_StablePtr_con_info"
@@ -105,17 +105,17 @@ ld-options:
          , "-u", "_base_GHCziPack_unpackCString_closure"
          , "-u", "_base_GHCziIOBase_stackOverflow_closure"
          , "-u", "_base_GHCziIOBase_heapOverflow_closure"
-         , "-u", "_base_GHCziIOBase_NonTermination_closure"
+         , "-u", "_base_ControlziException_nonTermination_closure"
          , "-u", "_base_GHCziIOBase_BlockedOnDeadMVar_closure"
          , "-u", "_base_GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "_base_GHCziIOBase_Deadlock_closure"
-         , "-u", "_base_GHCziIOBase_NestedAtomically_closure"
+         , "-u", "_base_ControlziException_nestedAtomically_closure"
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
 #else
-           "-u", "base_GHCziBase_Izh_static_info"
-         , "-u", "base_GHCziBase_Czh_static_info"
-         , "-u", "base_GHCziFloat_Fzh_static_info"
-         , "-u", "base_GHCziFloat_Dzh_static_info"
+           "-u", "ghczmprim_GHCziTypes_Izh_static_info"
+         , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
+         , "-u", "ghczmprim_GHCziTypes_Fzh_static_info"
+         , "-u", "ghczmprim_GHCziTypes_Dzh_static_info"
          , "-u", "base_GHCziPtr_Ptr_static_info"
          , "-u", "base_GHCziWord_Wzh_static_info"
          , "-u", "base_GHCziInt_I8zh_static_info"
@@ -127,10 +127,10 @@ ld-options:
          , "-u", "base_GHCziWord_W32zh_static_info"
          , "-u", "base_GHCziWord_W64zh_static_info"
          , "-u", "base_GHCziStable_StablePtr_static_info"
-         , "-u", "base_GHCziBase_Izh_con_info"
-         , "-u", "base_GHCziBase_Czh_con_info"
-         , "-u", "base_GHCziFloat_Fzh_con_info"
-         , "-u", "base_GHCziFloat_Dzh_con_info"
+         , "-u", "ghczmprim_GHCziTypes_Izh_con_info"
+         , "-u", "ghczmprim_GHCziTypes_Czh_con_info"
+         , "-u", "ghczmprim_GHCziTypes_Fzh_con_info"
+         , "-u", "ghczmprim_GHCziTypes_Dzh_con_info"
          , "-u", "base_GHCziPtr_Ptr_con_info"
          , "-u", "base_GHCziPtr_FunPtr_con_info"
          , "-u", "base_GHCziStable_StablePtr_con_info"
@@ -139,11 +139,11 @@ ld-options:
          , "-u", "base_GHCziPack_unpackCString_closure"
          , "-u", "base_GHCziIOBase_stackOverflow_closure"
          , "-u", "base_GHCziIOBase_heapOverflow_closure"
-         , "-u", "base_GHCziIOBase_NonTermination_closure"
+         , "-u", "base_ControlziException_nonTermination_closure"
          , "-u", "base_GHCziIOBase_BlockedOnDeadMVar_closure"
          , "-u", "base_GHCziIOBase_BlockedIndefinitely_closure"
          , "-u", "base_GHCziIOBase_Deadlock_closure"
-         , "-u", "base_GHCziIOBase_NestedAtomically_closure"
+         , "-u", "base_ControlziException_nestedAtomically_closure"
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
 #endif