[commit: ghc] wip/jenkins: Fix windows paths (6558453)

[git at git.haskell.org]

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

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/6558453b3ea79e6adfc10b3f0ecc46df192a37a1/ghc

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

commit 6558453b3ea79e6adfc10b3f0ecc46df192a37a1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Jun 9 13:50:09 2017 -0400

    Fix windows paths


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

6558453b3ea79e6adfc10b3f0ecc46df192a37a1
 Jenkinsfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9a098e0..acaf373 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -108,18 +108,21 @@ def withMingw(String msystem, Closure f) {
   // Derived from msys2's /etc/msystem
   def msysRoot = 'C:\\msys64'
   if (msystem == 'MINGW32') {
-    prefix = '${msysRoot}\\mingw32'
+    prefix = "${msysRoot}\\mingw32"
     carch = 'i686'
+    ghcPath = '$HOME/ghc-8.0.2-i386/bin'
   } else if (msystem == 'MINGW64') {
-    prefix = '${msysRoot}\\mingw64'
+    prefix = "${msysRoot}\\mingw64"
     carch = 'x86_64'
+    ghcPath = '$HOME/ghc-8.0.2-x86_64/bin'
   } else {
     fail
   }
   chost = '${carch}-w64-mingw32'
 
   withEnv(["MSYSTEM=${msystem}",
-           "PATH+mingw=C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386\\bin",
+           "PATH+mingw=${prefix}\\bin",
+           "PATH+ghc=${ghcPath}",
            "MSYSTEM_PREFIX=${prefix}",
            "MSYSTEM_CARCH=${carch}",
            "MSYSTEM_CHOST=${chost}",