[commit: ghc] wip/jenkins: Fix naming of crossCompiling (0d2c2cb)

[git at git.haskell.org]

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

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

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

commit 0d2c2cb4a372cc988fc8672d987a6f0974dc63ab
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jul 12 17:01:16 2017 -0400

    Fix naming of crossCompiling


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

0d2c2cb4a372cc988fc8672d987a6f0974dc63ab
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ec9e1d9..da5021f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -72,10 +72,10 @@ parallel (
     }
   },
   "linux x86-64 -> aarch64 unreg" : {
-    node(label: 'linux && amd64') {buildAndTestGhc(cross: true, targetTriple: 'aarch64-linux-gnu', unreg: true)}
+    node(label: 'linux && amd64') {buildAndTestGhc(crossCompiling: true, targetTriple: 'aarch64-linux-gnu', unreg: true)}
   },
   "linux x86-64 -> aarch64" : {
-    node(label: 'linux && amd64') {buildGhc(cross: true, targetTriple: 'aarch64-linux-gnu')}
+    node(label: 'linux && amd64') {buildGhc(crossCompiling: true, targetTriple: 'aarch64-linux-gnu')}
     node(label: 'linux && aarch64') {testGhc(targetTriple: 'aarch64-linux-gnu')}
   },
   "aarch64"            : {
@@ -153,7 +153,7 @@ def buildAndTestGhc(params) {
 
 def buildGhc(params) {
   String targetTriple = params?.targetTriple
-  boolean cross = params?.crossTarget ?: false
+  boolean crossCompiling = params?.crossCompiling ?: false
   boolean unreg = params?.unreg ?: false
   boolean disableLargeAddrSpace = params?.disableLargeAddrSpace ?: false
   String makeCmd = params?.makeCmd ?: 'make'
@@ -173,7 +173,7 @@ def buildGhc(params) {
                 ValidateHpc=NO
                 BUILD_DPH=NO
                 """
-      if (cross) {
+      if (crossCompiling) {
         build_mk += """
                     # Cross compiling
                     HADDOCK_DOCS=NO
@@ -186,7 +186,7 @@ def buildGhc(params) {
       writeFile(file: 'mk/build.mk', text: build_mk)
 
       def configure_opts = []
-      if (cross) {
+      if (crossCompiling) {
         configure_opts += '--target=${targetTriple}'
       }
       if (disableLargeAddrSpace) {