From: sof <unknown>
Date: Thu, 6 Dec 2001 08:24:36 +0000 (+0000)
Subject: [project @ 2001-12-06 08:24:36 by sof]
X-Git-Tag: Approximately_9120_patches~456
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7fe540d8c382712d2eab02a05556ed168311ae2e;p=ghc-hetmet.git

[project @ 2001-12-06 08:24:36 by sof]
package rts (mingw32): in installed mode, add gcc-lib/ to library_dirs,
forcing it to be used by default. This allows other backend tools to be
used (e.g., `dllwrap') without haphazardly mixing & matching (import)
libs.

MERGE TO STABLE.
---

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index eab4a01..0856ab5 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -64,7 +64,13 @@ package_details installing
         import_dirs    = [],
         source_dirs    = [],
         library_dirs   = if installing
-                            then [ "$libdir" ]
+                            then 
+#ifdef mingw32_TARGET_OS
+				-- force the dist-provided gcc-lib/ into scope.
+			    	 [ "$libdir", "$libdir/gcc-lib" ]
+#else
+			    	 [ "$libdir" ]
+#endif
                             else [ ghc_src_dir cGHC_RUNTIME_DIR ],
         hs_libraries      = [ "HSrts" ],
 	extra_libraries   =