[commit: ghc] wip/jenkins: Cross (22f0b20)

git at git.haskell.org git at git.haskell.org
Thu May 18 05:03:55 UTC 2017


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

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

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

commit 22f0b2013db170e287808c2b79dd4f5921ef369f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu May 18 01:00:42 2017 -0400

    Cross


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

22f0b2013db170e287808c2b79dd4f5921ef369f
 Jenkinsfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 16ab84c..93d0937 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ properties(
       ])
   ])
 
-if (true) {
+if (false) {
   node(label: 'linux && aarch64') {
     stage('Testing') {
       sh 'pwd'
@@ -23,6 +23,8 @@ if (true) {
 
 parallel (
   "linux x86-64" : {node(label: 'linux && amd64') {buildGhc(params.runNofib)}},
+  "linux x86-64 -> aarch64" : {
+                    node(label: 'linux && amd64') {buildGhc(params.runNofib, 'aarch64-linux-gnu')}},
   "aarch64"      : {node(label: 'linux && aarch64') {buildGhc(false)}},
   "osx"          : {node(label: 'darwin') {buildGhc(false)}}
 )
@@ -31,7 +33,7 @@ def installPackages(String[] pkgs) {
   sh "cabal install -j${env.THREADS} --with-compiler=`pwd`/inplace/bin/ghc-stage2 --package-db=`pwd`/inplace/lib/package.conf.d ${pkgs.join(' ')}"
 }
 
-def buildGhc(boolean runNofib) {
+def buildGhc(boolean runNofib, String target_triple) {
   stage('Clean') {
     if (false) {
       sh 'make distclean'
@@ -52,9 +54,14 @@ def buildGhc(boolean runNofib) {
             ValidateHpc=NO
             BUILD_DPH=NO
             """)
+
+    def target_opt = ''
+    if (target_triple) {
+      target_opt = "--target=${target_triple}"
+    }
     sh """
        ./boot
-       ./configure --enable-tarballs-autodownload
+       ./configure --enable-tarballs-autodownload ${target_opt}
        make -j${env.THREADS}
        """
   }



More information about the ghc-commits mailing list