[project @ 2002-07-12 17:20:57 by sof]

mkdll: in installed mode, invoke the 'dllwrap' that's distributed with GHC,
and feed it the right options.

Merge to STABLE.

diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs
index a108c9e..83d833c 100644 (file)
--- a/ghc/compiler/main/SysTools.lhs
+++ b/ghc/compiler/main/SysTools.lhs
@@ -352,7 +352,11 @@ initSysTools minusB_args
        ; let split_path  = perl_path ++ " \"" ++ split_script ++ "\""
              mangle_path = perl_path ++ " \"" ++ mangle_script ++ "\""
 
-       ; let mkdll_path = cMKDLL
+       ; let mkdll_path 
+               | am_installed = pgmPath (installed "gcc-lib/") cMKDLL ++
+                                " --dlltool-name " ++ pgmPath (installed "gcc-lib/") "dlltool" ++
+                                " --driver-name " ++ gcc_path
+               | otherwise    = cMKDLL
 #else
        --              UNIX-SPECIFIC STUFF
        -- On Unix, the "standard" tools are assumed to be