autogen.sh | 2 +-
compilerplugins/clang/pluginhandler.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d057e61cb5aae15ea37ce9ac824647cd2060e331
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat Nov 24 22:36:48 2018 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Nov 25 00:25:43 2018 +0100
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 <sberg...@redhat.com>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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";
diff --git a/compilerplugins/clang/pluginhandler.hxx
b/compilerplugins/clang/pluginhandler.hxx
index 1cb405d54d35..d51afebccac7 100644
--- a/compilerplugins/clang/pluginhandler.hxx
+++ b/compilerplugins/clang/pluginhandler.hxx
@@ -91,7 +91,7 @@ private:
std::vector< std::string > _args;
};
-} // namespace
+}
#endif // COMPILEPLUGIN_H
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
