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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 336bd632f916330de73f2fe739c6640449200f32
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Oct 7 13:57:48 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 7 21:56:08 2019 +0200

    handle more -arch: options when avoiding D9025
    
    Change-Id: I97ff0418e25aeaea4cae349f2d228fb35219b5c2
    Reviewed-on: https://gerrit.libreoffice.org/80374
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 3f2630e0eec4..3530bdf65ee9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -45,10 +45,10 @@ endef
 
 # Avoid annoying warning D9025 about overriding command-line arguments.
 gb_Helper_remove_overriden_flags = \
-    $(filter-out -W4 -w -arch:SSE -arch:AVX2 -Od -O2,$(1)) \
+    $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2,$(1)) \
     $(lastword $(filter -W4 -w,$(1))) \
     $(lastword $(filter -Od -O2,$(1))) \
-    $(lastword $(filter -arch:SSE -arch:AVX2,$(1)))
+    $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1)))
 
 # $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins,symbols)
 define gb_CObject__command_pattern