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

Andrea Gelmini (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 19 15:24:17 UTC 2019


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

New commits:
commit 85c10c4e4994f7be0498a6757650a22aba548e4b
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Dec 19 13:11:56 2019 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Dec 19 16:23:21 2019 +0100

    Fix typo in code
    
    Change-Id: I7c71e16628819bd60664f9b4dc70f0f0762afb48
    Reviewed-on: https://gerrit.libreoffice.org/85521
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 2e45d9d7d212..44f1949e2e73 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -44,7 +44,7 @@ define gb_CObject__compiler
 endef
 
 # Avoid annoying warning D9025 about overriding command-line arguments.
-gb_Helper_remove_overriden_flags = \
+gb_Helper_remove_overridden_flags = \
     $(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))) \
@@ -58,7 +58,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	$(filter-out -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \
 		$(DEFS) \
 		$(gb_LTOFLAGS) \
-		$(call gb_Helper_remove_overriden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \
+		$(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \
 			$(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
 		$(if $(EXTERNAL_CODE), \
 			$(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \
@@ -95,7 +95,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
 	unset INCLUDE && \
 	$(filter-out -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \
-		$(call gb_Helper_remove_overriden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \
+		$(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \
 			$(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
 		-Fd$(PDBFILE) \
 		$(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \


More information about the Libreoffice-commits mailing list