diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-05-06 10:43:24 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-05-07 10:58:53 +0200 |
commit | 75edcfc0569ca76fa22db451fd61138e52870a62 (patch) | |
tree | 80cbfa96dc4267a5c0f1e06690f574c06e88dc7d /solenv | |
parent | a638c73fcfc4480d652ba86754a3f96c693f8e12 (diff) |
no longer force -arch:SSE on Windows
SSE2 has been pretty much a requirement for running Windows since
about 2018, so there should be ~nobody needing this.
https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html
Change-Id: I579eb92c18e42c57aa1421b889cfa7997b84915f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93558
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 848cb96397e3..b9bde52cdc01 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -41,7 +41,7 @@ define gb_CObject__compiler $(if $(filter %.c,$(2)), \ $(if $(3), $(3), $(gb_CC)), \ $(if $(filter -clr,$(1)), \ - $(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl, + $(MSVC_CXX) -I$(SRCDIR)/solenv/clang-cl, \ $(if $(3), $(3), $(gb_CXX)))))) endef @@ -57,10 +57,10 @@ define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ unset INCLUDE && \ - $(filter-out -arch:SSE,$(call gb_CObject__compiler,$(2),$(3),$(7))) \ + $(call gb_CObject__compiler,$(2),$(3),$(7)) \ $(DEFS) \ $(gb_LTOFLAGS) \ - $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \ + $(call gb_Helper_remove_overridden_flags, \ $(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ $(if $(EXTERNAL_CODE), \ $(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \ @@ -98,8 +98,8 @@ $(call gb_Output_announce,$(2),$(true),PCH,1) $(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),$(8))) \ - $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \ + $(call gb_CObject__compiler,$(4) $(5),$(3),$(8)) \ + $(call gb_Helper_remove_overridden_flags, \ $(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ -Fd$(PDBFILE) \ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ |