X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fpackage.conf.in;h=d57ef62039d36aaac83d985473d351600365e6b6;hb=98c68a1c5b63aadf9c7917274519d95bbe9394d4;hp=e45ecce4573bf66422a4078460a869ffa2d8bf8f;hpb=fdf1cd0399158308769fcb2ab7e46e215a68d865;p=ghc-hetmet.git

diff --git a/rts/package.conf.in b/rts/package.conf.in
index e45ecce..d57ef62 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"/gmp/gmpbuild"
+			, FPTOOLS_TOP_ABS"/gmp"
 # endif
 #endif
 
@@ -150,6 +150,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