trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch master updated: Adds looking for gcc-4.9 on e.g. Ubuntu-12
Date Sun, 27 Nov 2016 21:19:35 GMT
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  384428f   Adds looking for gcc-4.9 on e.g. Ubuntu-12
384428f is described below

commit 384428fdef4618d341c3b8b77d71d6bfb95c4016
Author: Leif Hedstrom <zwoop@apache.org>
AuthorDate: Sun Nov 27 14:19:20 2016 -0700

    Adds looking for gcc-4.9 on e.g. Ubuntu-12
---
 ci/jenkins/bin/environment.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ci/jenkins/bin/environment.sh b/ci/jenkins/bin/environment.sh
index 1c92466..2d6c698 100755
--- a/ci/jenkins/bin/environment.sh
+++ b/ci/jenkins/bin/environment.sh
@@ -62,10 +62,15 @@ fi
 
 # I can't figure out how to deal with scl enable devtoolset-3 bash and the sub-shell with
Jenkins,
 # so hacking this up for now.
-if test "$ATS_IS_7" == "yes" -a -x "/opt/rh/devtoolset-3/root/usr/bin/gcc"; then
-    export CC="/opt/rh/devtoolset-3/root/usr/bin/gcc"
-    export CXX="/opt/rh/devtoolset-3/root/usr/bin/g++"
-    export PATH="/opt/rh/devtoolset-3/root/usr/bin:${PATH}"
+if test "$ATS_IS_7" == "yes"; then
+    if test -x "/opt/rh/devtoolset-3/root/usr/bin/gcc"; then
+	export CC="/opt/rh/devtoolset-3/root/usr/bin/gcc"
+	export CXX="/opt/rh/devtoolset-3/root/usr/bin/g++"
+	export PATH="/opt/rh/devtoolset-3/root/usr/bin:${PATH}"
+    elif test -x "/usr/bin/gcc-4.9"; then
+	export CC="/usr/bin/gcc-4.9"
+	export CXX="/usr/bin/g++-4.9"
+    fi
 fi
 
 # Figure out parallelism for regular builds / bots

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message