summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@centrum.cz>2021-11-30 22:19:19 +0100
committerLuboš Luňák <l.lunak@collabora.com>2021-12-01 13:37:05 +0100
commit9425ea3f8f5622e857dc1e860b151fd94323de0c (patch)
treebc1f97abc82ced3fc0b9c0b2052ad7823ea05fbf /solenv
parentfe1da0ce2e097e5b8db6be9c141f2615b45ea8e7 (diff)
apparently link.exe -dump is a short for dumpbin.exe
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 <l.lunak@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk4
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk1
2 files changed, 3 insertions, 2 deletions
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