solenv/gbuild/platform/com_GCC_defs.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6fb9f368c6824a8ff7bc5bc5cf66fc2df7d055b7
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Sat Feb 27 22:30:41 2021 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Sun Feb 28 21:50:03 2021 +0100
gbuild: don't use -Wunused-macros with sccache
In at least soltools, jurt and gperf generated files, build with GCC and
sccache 0.2.16-alpha.0 reports spurious -Werror=implicit-fallthrough=
due to comments and these go away by configuring sccache with
rewrite_includes_only = true.
But his results in
cc1: error: ‘-fdirectives-only’ is incompatible with ‘-Wunused-macros’
so disable that like for clang-with-icecream builds.
Change-Id: I6dec38e86aa6e22591d7a700a8daddf3fed88b16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111716
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index d8784dfb6a6e..876d57ab6fa2 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -57,7 +57,7 @@ gb_CFLAGS_COMMON := \
-Wstrict-prototypes \
-Wundef \
-Wunreachable-code \
- $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring
icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \
+ $(if $(or $(and $(COM_IS_CLANG),$(or $(findstring
icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),$(findstring
sccache,$(CC))),,-Wunused-macros) \
$(if $(COM_IS_CLANG),-Wembedded-directive) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
@@ -74,7 +74,7 @@ gb_CXXFLAGS_COMMON := \
-Wextra \
-Wundef \
-Wunreachable-code \
- $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring
icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \
+ $(if $(or $(and $(COM_IS_CLANG),$(or $(findstring
icecc,$(CXX)),$(findstring icecc,$(CCACHE_PREFIX)))),$(findstring
sccache,$(CXX))),,-Wunused-macros) \
$(if $(COM_IS_CLANG),-Wembedded-directive) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
