[commit: ghc] wip/jenkins: No trailing newline (698bdd7)

[git at git.haskell.org]

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

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

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

commit 698bdd7c8dc77ebc704df01ff593c91851cfe764
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Jun 19 07:27:07 2017 -0400

    No trailing newline


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

698bdd7c8dc77ebc704df01ff593c91851cfe764
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9aac44f..a808fcd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,11 +83,13 @@ parallel (
     }
   },
   // Requires cygpath plugin?
+  /*
   "windows 64"         : {
     node(label: 'windows && amd64') {
       withMingw('MINGW64') { buildAndTestGhc(targetTriple: 'x86_64-w64-mingw32') }
     }
   },
+  */
   "windows 32"         : {
     node(label: 'windows && amd64') {
       withMingw('MINGW32') { buildAndTestGhc(targetTriple: 'x86_64-pc-msys') }
@@ -109,9 +111,9 @@ if (params.runNofib) {
 
 def withMingw(String msystem, Closure f) {
   // Derived from msys2's /etc/msystem
-  def msysRoot = 'C:\\msys64'
+  String msysRoot = 'C:\\msys64'
   String carch, prefix, ghcPath
-  home = sh(script: 'echo $HOME', returnStdout: true)
+  home = sh(script: 'echo -n $HOME', returnStdout: true)
   if (msystem == 'MINGW32') {
     prefix = "${msysRoot}\\mingw32"
     carch = 'i686'