diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-24 22:36:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-25 00:25:43 +0100 |
| commit | d057e61cb5aae15ea37ce9ac824647cd2060e331 (patch) | |
| tree | 4e5d33b56435490997ebe7f34eb016495e6aa20e /autogen.sh | |
| parent | 2cc09c4650c2fc6acc0157cd26acad248f32c5ac (diff) | |
Restrict Developer Toolset to Config=linux_gcc_release_64
The Jenkins "Gerrit Linux clang/dbgutil" builds started to fail in odd ways,
presumably because of having the Developer Toolset in the PATH now when building
compilerplugins. So change compilerplugins/clang/pluginhandler.hxx slightly to
force rebuild.
Change-Id: I97b8f89dc2e20c85f130284ca5326a5c96c2a1ba
Reviewed-on: https://gerrit.libreoffice.org/63962
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index 478aed6944b5..98dcb950886e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -153,7 +153,7 @@ if (defined $ENV{LODE_HOME}) } # For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS against Developer # Toolset 7: - if (-d '/opt/rh/devtoolset-7/root/usr/bin') + if ($ENV{Config} eq 'linux_gcc_release_64' && -d '/opt/rh/devtoolset-7/root/usr/bin') { $ENV{PATH}="/opt/rh/devtoolset-7/root/usr/bin:$ENV{PATH}"; print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n"; |