summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-05 10:21:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-06 07:26:14 +0100
commite754d0931ca75403647cc16100edd98e7e5ceadb (patch)
treec47c4b87494d17a76b74022e57c066e74a13909d /distro-configs
parent421d4bc13017988f1a1311a92b93177cf2bbc306 (diff)
Remove CXXFLAGS_CXX11 from Clang plugin compilation
CXXFLAGS_CXX11 is for the compiler used to compile LO proper. The plugin needs to be compiled in a way compatible with compiling Clang, and the compiler and any relevant flags can be controlled with COMPILER_PLUGINS_CXX. (And at least on macOS when compiling LO against a locally-built recent Clang trunk, CXXFLAGS_CXX11 will now contain -std=gnu++17, but COMPILER_PLUGINS_CXX can still point at Apple's Xcode clang++, which does not understand -std=gnu++17.) Also, if COMPILER_PLUGINS_CXX is not set, simply default it to g++ instead of trying to construct an acceptable CLANGCXX value from CXX (which would be Clang). (The problem with using Clang without CXXFLAGS_CXX11 is that Clang, unlike GCC, typically defaults to C++03, but building compilerplugins requires C++11 at least. That would cause e.g. the Gerrit/Jenkins linux_clang_dbgutil_64 builds to fail---but which also needs COMPILER_PLUGINS_CXX to be explicitly set to "g++ -std=c++11" as GCC on those machines is still 4.8.5 defaulting to C++03.) Change-Id: Id4ee4e54fa871cb6e621069cd050ae5b31922b34 Reviewed-on: https://gerrit.libreoffice.org/45856 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
-rw-r--r--distro-configs/Jenkins/linux_clang_dbgutil_641
1 files changed, 1 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/linux_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64
index 61c274af4caf..9865be076515 100644
--- a/distro-configs/Jenkins/linux_clang_dbgutil_64
+++ b/distro-configs/Jenkins/linux_clang_dbgutil_64
@@ -1,2 +1,3 @@
--enable-dbgutil
--enable-compiler-plugins
+COMPILER_PLUGINS_CXX=g++ -std=c++11