From 0adc21fcff02d7172587c540a0d091e46dd399ca Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 3 Dec 2018 11:34:26 +0100 Subject: Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux ...aka "Tinderbox on Master for Linux-DbgUtil", . This is similar to ab8454eb26f72f2d4081d90cb7e60e53e4a5590d "Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux_dbg". However, unlike lo_tb_master_linux_dbg, which is restricted to CentOS-based tb75-lilith, lo_tb_master_linux is restricted to label TB_Rel, which is currently matched to CentOS-based tb75-lilith, tb76-maggie, and tb76-pollux, plus non-CentOS based gandalf. The latter thus doesn't have Developer Toolset 7, so setting CC/CXX this way won't work for gandalf. I'm thus removing gandalf from . Change-Id: Ied305476347d107db4087f710c05300c84ae7e85 Reviewed-on: https://gerrit.libreoffice.org/64444 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- distro-configs/Jenkins/Linux_rel_master.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'distro-configs/Jenkins') diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 8494945080de..2ce88b800f0f 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1 +1,3 @@ --enable-kde4 +CC=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ -- cgit