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-23 08:05:15 +0200 |
| commit | 31a296c607fedf62870138af50cf4c63e6134e93 (patch) | |
| tree | 1b36d00c69aec6fb70682f382604fa817487b4a9 | |
| parent | 2d95b3846eac367d2baadc194ab258dc31e7bd33 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124081
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.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 505191069005..aa30d13951fd 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -59,7 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\ unset INCLUDE && \ $(call gb_CObject__compiler,$(2),$(3),$(7)) \ $(DEFS) \ - $(gb_LTOFLAGS) \ + $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \ $(call gb_Helper_remove_overridden_flags, \ $(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ $(if $(EXTERNAL_CODE), \ @@ -103,7 +103,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) \ |