summaryrefslogtreecommitdiff
path: root/solenv/gbuild/platform/com_MSC_defs.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/platform/com_MSC_defs.mk')
-rwxr-xr-xsolenv/gbuild/platform/com_MSC_defs.mk17
1 files changed, 8 insertions, 9 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 6dbb38127975..f79432793999 100755
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -151,11 +151,13 @@ gb_CFLAGS := \
-wd4512 \
-wd4706 \
-wd4800 \
+ -wd4267 \
ifneq ($(COM_IS_CLANG),TRUE)
+# clang-cl doesn't suport -Wv:18 for now
gb_CFLAGS += \
- $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+ -Wv:18 \
endif
@@ -176,6 +178,7 @@ gb_CXXFLAGS := \
-wd4244 \
-wd4250 \
-wd4251 \
+ -wd4267 \
-wd4275 \
-wd4290 \
-wd4351 \
@@ -188,12 +191,7 @@ gb_CXXFLAGS := \
-wd4706 \
-wd4800 \
-ifeq ($(CPUNAME),X86_64)
-
-gb_CXXFLAGS += \
- -wd4267 \
-
-else
+ifeq ($(CPUNAME),INTEL)
gb_CXXFLAGS += \
-Zm500 \
@@ -206,7 +204,7 @@ endif
ifneq ($(COM_IS_CLANG),TRUE)
gb_CXXFLAGS += \
- $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+ -Wv:18 \
endif
@@ -276,7 +274,8 @@ gb_CXXCLRFLAGS := $(gb_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-EHa \
-clr \
-wd4339 \
- $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
+ -Wv:18 \
+ -wd4267 \
ifeq ($(COM_IS_CLANG),TRUE)