X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=77fb192e823c7c14b19fcb4ecda88796c0cbecb0;hb=73637ad66b7f88e57dcd0e0ea93b3d7bf8fb0d78;hp=5b75be92bf3b9e8ba7cb3620f1ad5e2ecf76f4cc;hpb=e7d4b777a1667ccd6912115d43272c3735316eea;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 5b75be9..77fb192 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
+library-dirs:		LIB_DIR GMP_LIB_DIRS
 # 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"
+library-dirs:		FPTOOLS_TOP_ABS"/rts" GMP_LIB_DIRS
 # if !defined(HAVE_LIBGMP) && !defined(HAVE_FRAMEWORK_GMP)
 			, FPTOOLS_TOP_ABS"/rts/gmp"
 # endif
@@ -53,9 +53,12 @@ extra-libraries:		"m"		/* for ldexp() */
                               ,"mingwex"
 # endif
 #endif
+#if USE_PAPI
+			     , "papi"
+#endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR
+include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
 # ifdef mingw32_HOST_OS
 			, INCLUDE_DIR"/mingw"
 # endif
@@ -139,12 +142,10 @@ ld-options:
          , "-u", "base_GHCziWeak_runFinalizzerBatch_closure"
 #endif
 
-#ifndef mingw32_HOST_OS
 #ifdef LEADING_UNDERSCORE
-	 , "-u", "_GHCziConc_ensureIOManagerIsRunning_closure"
+	 , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure"
 #else
-	 , "-u", "GHCziConc_ensureIOManagerIsRunning_closure"
-#endif
+	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
 #endif
 
 framework-dirs: