[commit: ghc] wip/jenkins: Nailed the Windows issue (ac69b09)

[git at git.haskell.org]

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

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

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

commit ac69b09741ef647a42195d1c08619458eb502b2b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 29 12:48:34 2017 -0400

    Nailed the Windows issue


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

ac69b09741ef647a42195d1c08619458eb502b2b
 Jenkinsfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0bd3c7b..20dbec0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,6 +24,9 @@ parallel (
   "aarch64"            : {
     node(label: 'linux && aarch64') {buildGhc(runNoFib: false)}
   },
+  "freebsd"            : {
+    node(label: 'freebsd && aarch64') {buildGhc(runNoFib: false)}
+  },
   // Requires cygpath plugin?
   // Make
   "windows 64"         : {
@@ -47,14 +50,10 @@ def buildGhc(params) {
 
   stage('Checkout') {
     checkout scm
-    if (msys) {
-      bat "git submodule update --init --recursive"
-    } else {
-      sh "git submodule update --init --recursive"
-    }
+    sh "git submodule update --init --recursive"
   }
 
-  stage('Build') {
+  stage('Configure') {
     def speed = 'NORMAL'
     if (params.nightly) {
       speed = 'SLOW'
@@ -87,10 +86,15 @@ def buildGhc(params) {
     sh """
        ./boot
        ./configure ${configure_opts}
-       make -j${env.THREADS}
        """
   }
 
+  stage('Build') {
+    sh "make -j${env.THREADS}"
+  }
+}
+
+def testGhc() {
   stage('Install testsuite dependencies') {
     if (params.nightly && !crossTarget) {
       def pkgs = ['mtl', 'parallel', 'parsec', 'primitive', 'QuickCheck',