diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-22 13:03:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-22 13:21:09 +0300 |
| commit | 869bf65f97a484b0c83cf03848dfc467c9cdde72 (patch) | |
| tree | 2f21a31018952fac5539591805430dc5a3c4f4f2 /solenv/gbuild | |
| parent | Add libcmtd (diff) | |
| download | core-869bf65f97a484b0c83cf03848dfc467c9cdde72.tar.gz core-869bf65f97a484b0c83cf03848dfc467c9cdde72.zip | |
Don't link with msvcrtd if LINKED_LIBS has libcmtd
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |