diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-10-12 23:22:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-10-13 01:01:00 +0200 |
| commit | fb3e13cae8ab0915facaf07fe5fca177a4041a9b (patch) | |
| tree | 4f84d6a49aab3aba53f986e4deb55a5993ae2126 | |
| parent | 0ad70397c0b940ca7ec0d1de98f15628aa98abec (diff) | |
MSVC LTO does not like mixing 32bit and 64 code
So disable LTO for x64 code when building for 32bit.
Change-Id: I8445d8307b3b797b78cea12e6322e0d792c71dfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123537
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index ca6c60064897..ad1bb2561262 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -68,7 +68,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(call gb_CObject__compiler,$(2),$(3),$(7)) \ $(call gb_Helper_remove_overridden_flags, \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \ $(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS)) \ $(if $(EXTERNAL_CODE), \ $(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \ @@ -111,7 +111,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ -Fd$(PDBFILE) \ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ - $(gb_LTOFLAGS) \ + $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \ $(gb_COMPILERDEPFLAGS) \ $(6) \ -c $(3) \ |