solenv/gbuild/platform/com_GCC_defs.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa503091cce61b0288645efeeab0937b11fe5403
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon Jul 2 16:55:26 2018 +0200
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.st...@cib.de>
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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
