[commit: ghc] wip/angerman/win32-cross-2: Assume `C:` to be system libraries on windows. (d12d240)

git at git.haskell.org git at git.haskell.org
Wed Mar 7 05:39:18 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/win32-cross-2
Link       : http://ghc.haskell.org/trac/ghc/changeset/d12d2409cee20c2fb4d1d3b9f7ae4e63ec7977b9/ghc

>---------------------------------------------------------------

commit d12d2409cee20c2fb4d1d3b9f7ae4e63ec7977b9
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Mar 7 13:38:44 2018 +0800

    Assume `C:` to be system libraries on windows.


>---------------------------------------------------------------

d12d2409cee20c2fb4d1d3b9f7ae4e63ec7977b9
 libraries/libiserv/src/Remote/Slave.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/libiserv/src/Remote/Slave.hs b/libraries/libiserv/src/Remote/Slave.hs
index 9387db1..701e7d2 100644
--- a/libraries/libiserv/src/Remote/Slave.hs
+++ b/libraries/libiserv/src/Remote/Slave.hs
@@ -119,6 +119,9 @@ hook verbose base_path pipe m = case m of
   -- as relative paths, the intention is to load a pre-existing system library,
   -- therefore we hook the LoadDLL call only for absolute paths to ship the
   -- dll from the host to the target.
+  Msg (LoadDLL path@('C':':':_)) -> do
+    when verbose $ putStrLn ("Need DLL: " ++ path)
+    return $ Msg (LoadDLL path)
   Msg (LoadDLL path) | isAbsolute path -> do
     when verbose $ putStrLn ("Need DLL: " ++ path ++ " at " ++ (base_path <//> path))
     handleLoad pipe path (base_path <//> path)



More information about the ghc-commits mailing list