X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=187ae4056cfcdb3acca17d710226bf8871408ea5;hp=0ccdb3ca5237613f4af4c8e696cc835223a5b6cc;hb=5123ae93cfc5cdfcecc84340a9517580ad900d64;hpb=07be901da936ec4a503a514b02c6d247f533b963

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 0ccdb3c..187ae40 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -15,15 +15,15 @@ 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"
+			, FPTOOLS_TOP_ABS"/gmp"
 # endif
 #endif
 
@@ -56,14 +56,19 @@ extra-libraries:		"m"		/* for ldexp() */
 #if USE_PAPI
 			     , "papi"
 #endif
+#ifdef USE_LIBFFI
+			      , "ffi"
+#endif
 
 #ifdef INSTALLING
-include-dirs:		INCLUDE_DIR
+include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
 # ifdef mingw32_HOST_OS
 			, INCLUDE_DIR"/mingw"
 # endif
 #else /* !INSTALLING */
 include-dirs:		FPTOOLS_TOP_ABS"/includes"
+             		FPTOOLS_TOP_ABS"/rts"
+             		FPTOOLS_TOP_ABS"/gmp/gmpbuild"
 #endif
 
 includes:		Stg.h
@@ -148,6 +153,14 @@ ld-options:
 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
 #endif
 
+/*  Pick up static libraries in preference over dynamic if in earlier search
+ *  path.  This is important to use the static gmp in preference on Mac OS.
+ *  The used option is specific to the Darwin linker.
+ */
+#ifdef darwin_BUILD_OS
+	 , "-Wl,-search_paths_first"
+#endif
+
 framework-dirs:
 
 #ifdef HAVE_FRAMEWORK_GMP