[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/com_GCC_defs.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a404d5525256e3a59948ec4a1894e70179b7d783
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Tue May 29 11:29:31 2018 +0200

    gbuild: avoid -Wunused-macros with clang and icecream
    
    Apparently the preprocessor leaves in the #define but expands the uses,
    so all macros are reported as unused.
    
    Change-Id: I064a8852ad1080c22440c2b0d05c9dfddcec45f1
    Reviewed-on: https://gerrit.libreoffice.org/54992
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index ac3cbc366cf7..8edc1bf7b48a 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 \
-	-Wunused-macros \
+	$(if $(and $(COM_IS_CLANG),$(findstring icecc,$(CC))),,-Wunused-macros) \
 	-finput-charset=UTF-8 \
 	-fmessage-length=0 \
 	-fno-common \
@@ -69,7 +69,7 @@ gb_CXXFLAGS_COMMON := \
 	-Wextra \
 	-Wundef \
 	-Wunreachable-code \
-	-Wunused-macros \
+	$(if $(and $(COM_IS_CLANG),$(findstring icecc,$(CXX))),,-Wunused-macros) \
 	-finput-charset=UTF-8 \
 	-fmessage-length=0 \
 	-fno-common \