diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2021-02-27 22:30:41 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-02 00:55:57 +0200 |
| commit | 61e41cf5fcb2283d7bcc1a06cc7edf6e8a88b768 (patch) | |
| tree | 1c1e2b85da7027ed2d3325f711b2525a20ac99d0 | |
| parent | c976a18758b77ab989f3cc1a34623ff403651801 (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.
Change-Id: I6dec38e86aa6e22591d7a700a8daddf3fed88b16
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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114856
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -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 1707a7481ee6..acf06a8dc1d5 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -61,7 +61,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 \ @@ -78,7 +78,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 \ |