diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2021-02-27 22:30:41 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-06 18:52:00 +0200 |
commit | 666c1793fdc6d152d6c321020661fcc11995d436 (patch) | |
tree | 31fe9554e1d5fbecc555ff035ee0f0a63dfb5f25 | |
parent | cb53bee61713cd02364d64dc4906e3be1ff324a1 (diff) |
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.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111716
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 6fb9f368c6824a8ff7bc5bc5cf66fc2df7d055b7)
Change-Id: I6dec38e86aa6e22591d7a700a8daddf3fed88b16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113048
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 6cb7dc556281162d2fcb55eee646d59e3acdeb30)
-rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 057ef8fd5762..c5e335071fa3 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -59,7 +59,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) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ @@ -73,7 +73,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) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ |