Kaydet (Commit) d057e61c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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/63962Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 2cc09c46
...@@ -153,7 +153,7 @@ if (defined $ENV{LODE_HOME}) ...@@ -153,7 +153,7 @@ if (defined $ENV{LODE_HOME})
} }
# For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS against Developer # For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS against Developer
# Toolset 7: # 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}"; $ENV{PATH}="/opt/rh/devtoolset-7/root/usr/bin:$ENV{PATH}";
print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n"; print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n";
......
...@@ -91,7 +91,7 @@ private: ...@@ -91,7 +91,7 @@ private:
std::vector< std::string > _args; std::vector< std::string > _args;
}; };
} // namespace }
#endif // COMPILEPLUGIN_H #endif // COMPILEPLUGIN_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment