#i122378# fix the dbgutil-enabled build on Windows

crt-debug libraries use different structure layouts than their
regular counterparts so mixing causes binary incompatibilities
which must be avoided. Always using the regular libs achieves this.

RepositoryFixes.mk

@@ -76,12 +76,8 @@ gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT)
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
-ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
-endif
-else
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else
@@ -136,12 +132,8 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
-ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
-endif
-else
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else

solenv/gbuild/platform/windows.mk

@@ -484,7 +484,7 @@ ifeq ($(USE_SYSTEM_STL),YES)
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_STLEXT := msvcprt.lib
 else
-gb_Library_STLEXT := msvcprtd.lib
+gb_Library_STLEXT := msvcprt.lib
 endif
 else
 ifeq ($(gb_PRODUCT),$(true))

solenv/inc/wntmsci11.mk

@@ -285,13 +285,13 @@ LINKFLAGSOPT=
 UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
+LIBCMT=msvcrt.lib
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=msvcrt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
 .ELSE # "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
+LIBCMT=libcmt.lib
 CDEFS+=-D_DEBUG
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
@@ -312,13 +312,13 @@ STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
 .IF "$(USE_SYSTEM_STL)" == "YES"
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= msvcprtd.lib
+LIBCMT+= msvcprt.lib
 .ELSE
 LIBCMT+= msvcprt.lib
 .ENDIF
 .ELSE # "$(DYNAMIC_CRT)"==""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= libcpmtd.lib
+LIBCMT+= libcpmt.lib
 .ELSE
 LIBCMT+= libcpmt.lib
 .ENDIF "$(USE_STLP_DEBUG)" == ""

soltools/mkdepend/makefile.mk

@@ -59,12 +59,7 @@ APP1OBJS=$(OBJFILES)
 APP1RPATH=NONE
 
 .IF "$(COM)"=="MSC"
-.IF "$(dbgutil)"==""
 APP1STDLIBS+=msvcprt.lib
-.ELSE
-APP1STDLIBS+=msvcprtd.lib
-CDEFS+=-D_DEBUG
-.ENDIF                        # "$(DBG_UTIL)"==""
 .ENDIF                        # "$(COM)"=="MSC"
 
 .IF "$(OS)"=="SOLARIS"