[commit: ghc] wip/jenkins: Reenable everything else (61c7edb)

[git at git.haskell.org]

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

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/61c7edbc564c9bdee7a76d6426153fa039bd159f/ghc

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

commit 61c7edbc564c9bdee7a76d6426153fa039bd159f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 29 22:45:19 2017 -0400

    Reenable everything else


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

61c7edbc564c9bdee7a76d6426153fa039bd159f
 Jenkinsfile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9c86c4a..90cf036 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,6 @@ properties(
   ])
 
 parallel (
-  /*
   "linux x86-64"       : {
     node(label: 'linux && amd64') {buildGhc(runNoFib: params.runNofib)}
   },
@@ -30,25 +29,22 @@ parallel (
       buildGhc(runNoFib: false, makeCmd: 'gmake', disableLargeAddrSpace: true)
     }
   },
-  */
   // Requires cygpath plugin?
-  // Make
   "windows 64"         : {
     node(label: 'windows && amd64') {
       withMingw('MINGW64') { buildGhc(runNoFib: false) }
     }
   },
-  /*
   "windows 32"         : {
     node(label: 'windows && amd64') {
-      buildGhc(runNoFib: false)
+      withMingw('MINGW64') { buildGhc(runNoFib: false) }
     }
   },
-  */
   //"osx"                : {node(label: 'darwin') {buildGhc(runNoFib: params.runNoFib)}}
 )
 
 def withMingw(String msystem, Closure f) {
+  // Derived from msys2's /etc/msystem
   def msysRoot = 'C:\\msys64'
   if (msystem == 'MINGW32') {
     prefix = '${msysRoot}\\mingw32'