From 5b0b08e49ad344ceb043e0cdd1e45b0aea3f559c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 25 Nov 2018 15:52:47 +0100 Subject: Better way of enabling Developer Toolset 7 for Jenkins' linux_gcc_release_64 Enabling it in the relevant distro-configs/Jenkins/* file is more intuitive than enabling it in autogen.sh (and avoids issues like d057e61cb5aae15ea37ce9ac824647cd2060e331 "Restrict Developer Toolset to Config=linux_gcc_release_64"), and will also be used for other Jenkins jobs like "Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux_dbg". Change-Id: If633044a90c35a12a73d60335839af0a106aa20f Reviewed-on: https://gerrit.libreoffice.org/63989 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- distro-configs/Jenkins/linux_gcc_release_64 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'distro-configs/Jenkins') diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index 962c332840de..e30c34f941a4 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -1,2 +1,4 @@ --disable-werror +CC=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ -- cgit