diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-09 17:54:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-09 17:55:34 +0100 |
| commit | 51a6fa350566350c84ceadb5df65a9b047ca77e8 (patch) | |
| tree | f26ed32042571fa776d2a4a136bcd3b2562881bf /solenv | |
| parent | 019ea173701eae4b8c5ffd45bb0063fc0a688ce0 (diff) | |
gbuild: fix LIBPATH for LIBRARY_X64 with MSVC 2017
Change-Id: I88601e8ad3d21554d6b8166bd7689e0a3b8b3a9f
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 1aef9384d8fc..23bb57e47708 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -175,7 +175,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \ $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \ $(if $(filter YES,$(LIBRARY_X64)), \ - -LIBPATH:$(COMPATH)/lib/amd64 \ + -LIBPATH:$(COMPATH)/lib/$(if $(filter 140,$(VCVER)),amd64,x64) \ -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:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64)) \ |