diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 21:07:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 21:11:04 +0200 |
| commit | fdf799585149aa872e1ef74adf2e73d5d056cf50 (patch) | |
| tree | b8a4e9e337df24ececee81deeaffbf1b74fa2627 | |
| parent | a7adcf0ed0515357d8eaccab4562054b334ca59b (diff) | |
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
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 9 |
1 files changed, 5 insertions, 4 deletions
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 |