diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-02 16:55:26 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-02 18:40:31 +0200 |
| commit | fa503091cce61b0288645efeeab0937b11fe5403 (patch) | |
| tree | d475859f7846f449fed90cbdd17c9a010c340fac /solenv | |
| parent | 36bade04d3780bc54c51b46bb0b63e69789658a5 (diff) | |
gbuild: avoid -Wunused-macros with clang and icecream+ccache
On Fedora, the recommended way to use icecream with ccache is to set
CCACHE_PREFIX=icecc - but then $CC does not indicate that icecream is
used.
Change-Id: Ie757e6c00b07df7664c368c0e9f9c9bc599f3651
Reviewed-on: https://gerrit.libreoffice.org/56815
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'solenv')
| -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 f2905d4588dd..64068b3ffd2c 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -55,7 +55,7 @@ gb_CFLAGS_COMMON := \ -Wstrict-prototypes \ -Wundef \ -Wunreachable-code \ - $(if $(and $(COM_IS_CLANG),$(findstring icecc,$(CC))),,-Wunused-macros) \ + $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ @@ -69,7 +69,7 @@ gb_CXXFLAGS_COMMON := \ -Wextra \ -Wundef \ -Wunreachable-code \ - $(if $(and $(COM_IS_CLANG),$(findstring icecc,$(CXX))),,-Wunused-macros) \ + $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ |