diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2016-04-11 13:33:21 +0900 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-05-05 13:00:22 +0000 |
| commit | 3085aba021b411370ab6bc2400e0652cf279d6d3 (patch) | |
| tree | 2fe79a1b124bef58e027da1510967d9af6d7436a /solenv | |
| parent | f07ff7ed8a23b4982ed9cd7d9e2083c9d0928384 (diff) | |
Fix linking of 64 bit artifacts in 32 bit Windows build with VS2015
In some 64bit Windows environments we get the link error while building
libraries for 64-bit Explorer extensions.
This patch will fix this error.
This error occours only when we build 32bit LibreOffice on 64bit Windows
with Visual Studio 2015.
In some environments UCRT SDK directory does not match Windows SDK
directory.
In that case UCRT library's directory path is incorrect at the linking
phase.
Change-Id: I245b1a70f5e1137a8840aa2e7a70f521eab18cb3
Reviewed-on: https://gerrit.libreoffice.org/23982
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index e7b5f5cbb049..c757f9a51f5f 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -172,7 +172,7 @@ $(call gb_Helper_abbreviate_dirs,\ -LIBPATH:$(COMPATH)/lib/amd64 \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64) \ - $(if $(filter-out 120,$(VCVER)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/ucrt/x64)) \ + $(if $(filter-out 120,$(VCVER)),-LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64)) \ $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ |