From 732bf455279d1db150c600bb1d2719ddde517480 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 23 Oct 2019 17:15:50 +0200 Subject: -W4 must come before -Wno-missing-braces for clang-cl ...or else -W4 would re-enable that and cause lots of warnings/errors. 87608490f205b2fbc2b453ad8ded33050ac29b90 "filter arguments to MSVC to avoid the annoying D9025 warning" had changed the relative order of those options on the command line. Change-Id: I2ff9de93cdc6e3dc63961af61169f0adf44f7c0b Reviewed-on: https://gerrit.libreoffice.org/81403 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- solenv/gbuild/platform/com_MSC_class.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2673e7d1b009..abfdaa16e1b1 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -45,8 +45,8 @@ endef # Avoid annoying warning D9025 about overriding command-line arguments. gb_Helper_remove_overriden_flags = \ - $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2,$(1)) \ $(lastword $(filter -W4 -w,$(1))) \ + $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2,$(1)) \ $(lastword $(filter -Od -O2,$(1))) \ $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) -- cgit