[Git][ghc/ghc][wip/ci-docs] mp

Matthew Pickering (@mpickering) gitlab at gitlab.haskell.org
Wed Feb 28 12:32:00 UTC 2024



Matthew Pickering pushed to branch wip/ci-docs at Glasgow Haskell Compiler / GHC


Commits:
dbed9cca by Matthew Pickering at 2024-02-28T12:30:35+00:00
mp

- - - - -


1 changed file:

- hadrian/src/Builder.hs


Changes:

=====================================
hadrian/src/Builder.hs
=====================================
@@ -385,7 +385,7 @@ instance H.Builder Builder where
                   mpp <- liftIO (lookupEnv "PYTHONPATH")
                   liftIO (print (convertWindowsPath <$> mpp))
 
-                  cmd' ["perl", path] [AddEnv "PYTHONPATH" (convertWindowsPath pp) |  Just pp <- [mpp]] buildArgs buildOptions
+                  cmd' ["perl", path] [AddEnv "PYTHONPATH" (convertWindowsPath pp) |  Just pp <- [mpp]] (map convertWindowsPath buildArgs) buildOptions
 
                 -- RunTest produces a very large amount of (colorised) output;
                 -- Don't attempt to capture it.
@@ -394,7 +394,7 @@ instance H.Builder Builder where
                   when (code /= ExitSuccess) $ do
                     fail "tests failed"
 
-                _  -> cmd' [path] (map convertWindowsPath buildArgs) (map convertWindowsPath buildOptions)
+                _  -> cmd' [path] buildArgs buildOptions
 
 convertWindowsPath :: FilePath -> FilePath
 convertWindowsPath (';':fp) = ':' : convertWindowsPath fp



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dbed9cca262c6c09b2aca2314d9ddc31753df14f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dbed9cca262c6c09b2aca2314d9ddc31753df14f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240228/ec71cf12/attachment-0001.html>


More information about the ghc-commits mailing list