summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-21 01:47:44 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-21 19:23:46 +0200
commit64aef99fdff76137527ed1b1b61691e638d1c44f (patch)
tree66aa5cc8fbaf9b065433e0f0d37dd74e222959c2
parentad4b542b34f802b44af330a5df2e3e35238e48a7 (diff)
gbuild: MSVC: ignore LIBS for static libraries
Not sure if it causes actual problems but all other platforms ignore LIBS on static libraries already when linking. Change-Id: I8a5ff4b2243b625827f82b0f64f007cea7c9d7c5
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index f4cec3becf45..fda55f6aae54 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -196,8 +196,7 @@ $(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))) \
- $(T_LIBS) \
- $(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.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 $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \