From 7eb7f488744bf36bc4835a1b10c86cc0d7a8afbf Mon Sep 17 00:00:00 2001
From: Renato Golin <renato.golin@linaro.org>
Date: Fri, 12 May 2017 11:47:31 +0100
Subject: tcwg-lvm-*: Add compiler option to the builds

This change adds a "compiler" option to override the system compiler if
no toolchain is provided by the parameters. The default is clang because
that's known to work on all architectures, while GCC 5.4 (Xenial) is
known to fail on ARM32 and ARM64 in some configurations.

The scripts need to be changed accordingly to set CC/CXX on their own
based in the new argument.

Change-Id: I0632d3a7d2c53650ac74ba5f2576774c6c7f7cf1
---
 tcwg-llvm-staged-build.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'tcwg-llvm-staged-build.yaml')

diff --git a/tcwg-llvm-staged-build.yaml b/tcwg-llvm-staged-build.yaml
index 9c22763565..3a98aa487d 100644
--- a/tcwg-llvm-staged-build.yaml
+++ b/tcwg-llvm-staged-build.yaml
@@ -34,6 +34,10 @@
             name: testsuite
             default: false
             description: 'Whether or not to trigger a test-suite with this build.'
+        - string:
+            name: compiler
+            default: 'clang'
+            description: 'Override the default system compiler. Only used if "toolchain" is empty.'
         - string:
             name: target_list
             default: 'tcwg-x86_64-cam'
@@ -104,6 +108,12 @@
             esac
             linkjobs=${buildjobs}
 
+            # Sets the system compiler
+            compiler_option=''
+            if [ "${toolchain:+set}" != "set" ] && [ "${compiler:+set}" = "set" ]; then
+              compiler_option="--compiler=${compiler}"
+            fi
+
             # Trigger toolchain name
             toolchain_file="${WORKSPACE}/llvm.params.toolchain"
             toolchain_file_option=""
@@ -135,7 +145,7 @@
                 --linkjobs=${linkjobs} \
                 --revision=${revision} \
                 --toolchain=${toolchain} \
-                $toolchain_file_option"
+                $toolchain_file_option $compiler_option "
 
             # Chained jobs
             if ${twostage}; then
-- 
cgit v1.2.3