Fix building libHSrts.dll by using ghc-pkg instead of grepping in base.cabal

[ghc-hetmet.git] / rts / package.conf.in

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 77fb192..d57ef62 100644 (file)
--- 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
 
@@ -64,6 +64,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 +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