From 49db45ad1492c39b74a3cb2ccaf900936ff31c15 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Wed, 8 Jun 2005 22:26:48 +0000 Subject: [PATCH] fixes bug 297124 "mar.exe fails to link with MSVC 2005 beta 2" r=darin,cls --- modules/libmar/tool/Makefile.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index b0aba899509..a0c990f6388 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -60,7 +60,11 @@ HOST_LIBS = $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) ifeq (WINNT,$(OS_ARCH)) EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32) -WIN32_EXE_LDFLAGS += /NODEFAULTLIB:LIBC +ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) +WIN32_EXE_LDFLAGS += -NODEFAULTLIB:LIBC +else +WIN32_EXE_LDFLAGS += -NODEFAULTLIB:LIBCMT +endif endif include $(topsrcdir)/config/rules.mk