Index: solenv/inc/wnt.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wnt.mk,v
retrieving revision 1.61
diff -u -w -b -i -r1.61 wnt.mk
--- solenv/inc/wnt.mk	29 Jan 2004 11:53:18 -0000	1.61
+++ solenv/inc/wnt.mk	6 Feb 2004 02:07:42 -0000
@@ -305,27 +305,32 @@
 .ELSE
 LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
+.IF "$(COMEX)" = "9"
+NODEFATLIBFLAGS = /NODEFAULTLIB:libc
+.ELSE
+NODEFATLIBFLAGS = /NODEFAULTLIB
+.ENDIF
 
 .IF "$(linkinc)" != ""
-LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv /INCREMENTAL:YES
+LINKFLAGS=$(NODEFATLIBFLAGS) /DEBUG:full /DEBUGTYPE:cv /INCREMENTAL:YES
 MAPFILE=
 .ELSE
 .IF "$(PRODUCT)"!="full"
-LINKFLAGS+= /NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv
+LINKFLAGS+= $(NODEFATLIBFLAGS) /DEBUG:full /DEBUGTYPE:cv
 .ELSE
-LINKFLAGS+= /NODEFAULTLIB /RELEASE /DEBUG:full
+LINKFLAGS+= $(NODEFATLIBFLAGS) /RELEASE /DEBUG:full
 .ENDIF
 MAPFILE=-out:$$@
 .ENDIF
 
 .IF "$(bndchk)" != ""
 LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv
+LINKFLAGS=$(NODEFATLIBFLAGS) /DEBUG:full /DEBUGTYPE:cv
 .ENDIF
 
 .IF "$(truetime)" != ""
 LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv
+LINKFLAGS=$(NODEFATLIBFLAGS) /DEBUG:full /DEBUGTYPE:cv
 .ENDIF
 
 LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
@@ -334,7 +339,7 @@
 LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
 LINKFLAGSTACK=/STACK:
 LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
+LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib $(NODEFATLIBFLAGS)
 LINKFLAGSDEBUG=/DEBUG:full /DEBUGTYPE:cv
 LINKFLAGSOPT=