From fdf799585149aa872e1ef74adf2e73d5d056cf50 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 8 May 2013 21:07:42 +0200 Subject: gbuild: MSVC avoid a warning from pyuno... ... which is caused by CPython's crazy naming convention that python module DLLs need to have .pyd suffix, so substitute that too when generating .pdb and .ilk filenames. Change-Id: Iaba9bdfb4c67d5fca016a0552e5ce9b0bdeb12ea --- solenv/gbuild/platform/com_MSC_class.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'solenv/gbuild/platform') diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index d101c653d7fc..107e6e5d8e8d 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -313,15 +313,16 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(if $(filter $(gb_MERGEDLIBS),$(1)),,\ $(call gb_Library_add_auxtarget,$(1),$(OUTDIR)/bin/$(notdir $(3)))) +# substitute .pyd here because pyuno has to follow python's crazy conventions ifneq ($(ENABLE_CRASHDUMP),) $(call gb_Library_add_auxtargets,$(1),\ - $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \ - $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \ + $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(patsubst %.pyd,%.dll,$(3)))) \ + $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(patsubst %.pyd,%.dll,$(3)))) \ ) else $(call gb_LinkTarget_add_auxtargets,$(2),\ - $(patsubst %.dll,%.pdb,$(3)) \ - $(patsubst %.dll,%.ilk,$(3)) \ + $(patsubst %.dll,%.pdb,$(patsubst %.pyd,%.dll,$(3))) \ + $(patsubst %.dll,%.ilk,$(patsubst %.pyd,%.dll,$(3))) \ ) endif -- cgit