diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-07 16:31:10 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-20 09:54:01 +0200 |
| commit | 034489fb640397db0160178e7ed70152f9c322ad (patch) | |
| tree | b244cad79640523b1f34a1da1b87a29c652564d2 /solenv | |
| parent | 39567b97ee270327b7bd9ad6277549963ae04077 (diff) | |
Drop LINK_X64_BINARY: any MSVC linker is suitable for any target platform
Change-Id: I8b080ad44f10e52fa5a726bd7cdf7dd8ff7e2dd4
Reviewed-on: https://gerrit.libreoffice.org/71913
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 0c0e73584f125025fb17d6be8f8050f3b7649c7d)
Reviewed-on: https://gerrit.libreoffice.org/74413
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv')
| -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 4f369f04544f..6a1887dd31d6 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -168,7 +168,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(PCHOBJS) $(NATIVERES)) && \ $(if $(filter $(call gb_Library__get_workdir_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \ unset INCLUDE && \ - $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \ + $(gb_LINK) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ @@ -201,7 +201,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(TARGETGUI)),&& mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest -updateresource:$(1)\;1 ) \ $(if $(filter Library,$(TARGETTYPE)),&& \ echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ - $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ + $(gb_LINK) \ -dump -exports $(ILIBTARGET) \ >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \ |