summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-23 17:15:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-23 20:32:53 +0200
commit732bf455279d1db150c600bb1d2719ddde517480 (patch)
tree0940b3b1932988940cdfe0ee761b737e4078c52e /solenv/gbuild
parent860fd4001f3c5e08acacb62134aa476ac2714108 (diff)
-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 <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk2
1 files changed, 1 insertions, 1 deletions
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)))