From 869bf65f97a484b0c83cf03848dfc467c9cdde72 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 22 Sep 2011 13:03:03 +0300 Subject: Don't link with msvcrtd if LINKED_LIBS has libcmtd --- solenv/gbuild/platform/windows.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/gbuild') diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index df9cc809158a..8d74118f2e80 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -391,7 +391,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ $(LIBS) \ - $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib msvcrtd.lib msvcprtd.lib kernel32.lib user32.lib)) \ + $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib user32.lib)) \ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) endef -- cgit