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

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 77fb192..187ae40 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -23,7 +23,7 @@ library-dirs:		LIB_DIR GMP_LIB_DIRS
 #else /* !INSTALLING */
 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,6 +56,9 @@ extra-libraries:		"m"		/* for ldexp() */
 #if USE_PAPI
 			     , "papi"
 #endif
+#ifdef USE_LIBFFI
+			      , "ffi"
+#endif
 
 #ifdef INSTALLING
 include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
@@ -64,6 +67,8 @@ include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
 # 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