From 9425ea3f8f5622e857dc1e860b151fd94323de0c Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 30 Nov 2021 22:19:19 +0100 Subject: apparently link.exe -dump is a short for dumpbin.exe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So use the latter, in case we'll want to use lld-link, as that one doesn't know -link. Change-Id: I35e05064da06741cae1aa267b455e22741fef090 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126157 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- solenv/gbuild/platform/com_MSC_class.mk | 4 ++-- solenv/gbuild/platform/com_MSC_defs.mk | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 55a35f9ba661..ea866d44ec63 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -296,8 +296,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Executable,$(TARGETTYPE)),&& 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 && \ - $(gb_LINK) \ - -dump -exports $(ILIBTARGET) \ + $(gb_DUMPBIN) \ + -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))) \ ; \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 08e799033eb5..7620adab7e79 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -26,6 +26,7 @@ include $(GBUILDDIR)/platform/windows.mk gb_CC := cl gb_CXX := cl gb_LINK := link +gb_DUMPBIN := dumpbin gb_AWK := awk gb_CLASSPATHSEP := ; gb_RC := rc -- cgit