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

[David Ostrovsky]

 solenv/gbuild/platform/com_MSC_defs.mk |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1baf5c3c66700b8072436ae0fdb210a442cc7e68
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Tue Mar 8 19:54:42 2016 +0000

    Fix unrecognized -Wv:18 option for clang-cl on MSVC 14.0
    
    Change-Id: I4ac94475b663c1ec1f5148b766a81a31adb1d49e
    Reviewed-on: https://gerrit.libreoffice.org/23038
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 93994e9..16abf4c 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -164,7 +164,6 @@ gb_CFLAGS := \
 	-wd4706 \
 	-wd4800 \
 	-Zc:wchar_t- \
-	$(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
 
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CFLAGS += \
@@ -175,6 +174,11 @@ gb_CFLAGS += \
 	-Wundef \
 	-Wunused-macros \
 
+else
+
+gb_CFLAGS += \
+	$(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+
 endif
 
 gb_CXXFLAGS := \
@@ -207,7 +211,6 @@ gb_CXXFLAGS := \
 	-wd4800 \
 	-wd4913 \
 	-Zc:wchar_t- \
-	$(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
 
 ifeq ($(CPUNAME),X86_64)
 
@@ -235,6 +238,11 @@ gb_CXXFLAGS += \
 	-Wundef \
 	-Wunused-macros \
 
+else
+
+gb_CXXFLAGS += \
+	$(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+
 endif
 
 # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A