diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-25 15:52:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-25 17:25:21 +0100 |
| commit | 5b0b08e49ad344ceb043e0cdd1e45b0aea3f559c (patch) | |
| tree | 35e5736b7f559cbaf7ffadfb16220db7ca691ca5 /distro-configs | |
| parent | c59a5b81e9521a92587e701bcad82bf643b00493 (diff) | |
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
<https://gerrit.libreoffice.org/#/c/63982/> "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 <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/linux_gcc_release_64 | 2 |
1 files changed, 2 insertions, 0 deletions
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++ |