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

diff --git a/rts/package.conf.in b/rts/package.conf.in
index e45ecce..1642101 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
 
@@ -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
@@ -66,6 +69,7 @@ include-dirs:		INCLUDE_DIR GMP_INCLUDE_DIRS
 include-dirs:		FPTOOLS_TOP_ABS"/includes"
              		FPTOOLS_TOP_ABS"/rts"
              		FPTOOLS_TOP_ABS"/gmp/gmpbuild"
+             		GMP_INCLUDE_DIRS
 #endif
 
 includes:		Stg.h
@@ -97,8 +101,8 @@ ld-options:
          , "-u", "_base_GHCziPtr_Ptr_con_info"
          , "-u", "_base_GHCziPtr_FunPtr_con_info"
          , "-u", "_base_GHCziStable_StablePtr_con_info"
-         , "-u", "_base_GHCziBase_False_closure"
-         , "-u", "_base_GHCziBase_True_closure"
+         , "-u", "_ghczmprim_GHCziBool_False_closure"
+         , "-u", "_ghczmprim_GHCziBool_True_closure"
          , "-u", "_base_GHCziPack_unpackCString_closure"
          , "-u", "_base_GHCziIOBase_stackOverflow_closure"
          , "-u", "_base_GHCziIOBase_heapOverflow_closure"
@@ -131,8 +135,8 @@ ld-options:
          , "-u", "base_GHCziPtr_Ptr_con_info"
          , "-u", "base_GHCziPtr_FunPtr_con_info"
          , "-u", "base_GHCziStable_StablePtr_con_info"
-         , "-u", "base_GHCziBase_False_closure"
-         , "-u", "base_GHCziBase_True_closure"
+         , "-u", "ghczmprim_GHCziBool_False_closure"
+         , "-u", "ghczmprim_GHCziBool_True_closure"
          , "-u", "base_GHCziPack_unpackCString_closure"
          , "-u", "base_GHCziIOBase_stackOverflow_closure"
          , "-u", "base_GHCziIOBase_heapOverflow_closure"
@@ -150,6 +154,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