diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-20 15:07:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-20 15:20:00 +0100 |
| commit | 397af236af9a2263c042d675efcc041a20c92059 (patch) | |
| tree | 387527eeea8401f9f5d3eca1e89699438aa2e7b4 /solenv | |
| parent | 4f995b395ea347469ca9c7681d2f01f63e966d96 (diff) | |
gbuild: MSVC 2012 does not like /pdb for static libraries
Complains with warning LNK4044 and ignores it.
Change-Id: Ie91369339d121a652ce51e9229c3ef3b1c39d214
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index b36bed81ac78..372710389555 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -190,9 +190,10 @@ $(call gb_Helper_abbreviate_dirs,\ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ - $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(T_LIBS) user32.lib) \ - $(if $(filter-out StaticLibrary,$(TARGETTYPE)),-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest) \ - -pdb:$(WORKDIR)/LinkTarget/$(2).pdb \ + $(if $(filter-out StaticLibrary,$(TARGETTYPE)),\ + $(T_LIBS) user32.lib \ + -manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \ + -pdb:$(WORKDIR)/LinkTarget/$(2).pdb) \ $(if $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then rm -f $(1); exit 42; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest -outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \ |