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

Generally set CCACHE_CPP2 for --enable-werror GCC

This obsoletes <https://gerrit.libreoffice.org/plugins/gitiles/lode/+/
b82e0a9d26ef4c81046c053ff831dccfc84c56be%5E!> "For linux_gcc_release_64, don't
let ccache strip comments" and fixes ccache for all builds using (recent) GCC.

Change-Id: I5fd20b2565f57073c545fe5d3a9639c2c0583a74
Reviewed-on: https://gerrit.libreoffice.org/63979
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst f4955d7b
...@@ -251,8 +251,14 @@ gb_COMPILER_PLUGINS_SETUP := ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.do ...@@ -251,8 +251,14 @@ gb_COMPILER_PLUGINS_SETUP := ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.do
gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \ gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
-Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
else else
gb_COMPILER_TEST_FLAGS := # Set CCACHE_CPP2 to prevent GCC -Werror=implicit-fallthrough= when ccache strips comments from C
# code (which still needs /*fallthrough*/-style comments to silence that warning):
ifeq ($(ENABLE_WERROR),TRUE)
gb_COMPILER_SETUP := CCACHE_CPP2=1
else
gb_COMPILER_SETUP := gb_COMPILER_SETUP :=
endif
gb_COMPILER_TEST_FLAGS :=
gb_COMPILER_PLUGINS := gb_COMPILER_PLUGINS :=
gb_COMPILER_PLUGINS_SETUP := gb_COMPILER_PLUGINS_SETUP :=
gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS :=
......
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