[commit: ghc] wip/jenkins: Various accumulated fixes (9d7b373)

[git at git.haskell.org]

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

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

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

commit 9d7b373c6ce505d16da130d5be103b9423712003
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Jun 27 17:31:58 2017 -0400

    Various accumulated fixes


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

9d7b373c6ce505d16da130d5be103b9423712003
 Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bcf3faa..fee5743 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,10 @@
 
   Linux (Debian) worker dependencies:
    * xutil-dev curl automake autoconf libtool python3 python3-sphinx, llvm-4.0
+
+   Requires approvals for:
+   * new net.sf.json.JSONObject
+
 */
 
 import net.sf.json.JSONObject
@@ -123,7 +127,7 @@ def withMingw(String msystem, Closure f) {
   } else {
     fail
   }
-  chost = "${carch}-w64-mingw32"
+  String chost = "${carch}-w64-mingw32"
 
   withEnv(["MSYSTEM=${msystem}",
            "PATH+mingw=${prefix}\\bin",
@@ -133,7 +137,7 @@ def withMingw(String msystem, Closure f) {
            "MSYSTEM_CHOST=${chost}",
            "MINGW_CHOST=${chost}",
            "MINGW_PREFIX=${prefix}",
-           "MINGW_PACKAGE_PREFIX=mingw-w64-${MSYSTEM_CARCH}",
+           "MINGW_PACKAGE_PREFIX=mingw-w64-${carch}",
            "CONFIG_SITE=${prefix}/etc/config.site"
           ], f)
 }
@@ -202,7 +206,7 @@ def buildGhc(params) {
       sh "${makeCmd} binary-dist"
       def json = new JSONObject()
       def tarPath = getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP')
-      def tarName = sh(script: "basename ${tarPath}", returnStdout: true)
+      def tarName = sh(script: "basename ${tarPath}", returnStdout: true).trim()
       json.put('tarName', tarName)
       json.put('dirName', getMakeValue(makeCmd, 'BIN_DIST_NAME'))
       json.put('ghcVersion', getMakeValue(makeCmd, 'ProjectVersion'))