gbuild: add support for building against MSVC debug runtime

Mainly this means using /MDd instead of /MD and /MTd instead of /MT in
the CFLAGS, and also re-mapping of .lib files to ones with "d".

Change-Id: Ifc56b53a66d5eb522c1695a34d68b08cad1d8338

embedserv/Library_emser.mk

@@ -58,15 +58,9 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\
 	uuid \
 ))
 
-ifeq ($(USE_DEBUG_RUNTIME),)
 $(eval $(call gb_Library_add_libs,emser,\
-	$(ATL_LIB)/atls.lib \
+	$(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
 ))
-else
-$(eval $(call gb_Library_add_libs,emser,\
-	$(ATL_LIB)/atlsd.lib \
-))
-endif
 
 $(eval $(call gb_Library_add_ldflags,emser,\
 	-LIBPATH:$(ATL_LIB) \

extensions/Library_oleautobridge.mk

@@ -59,15 +59,9 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\
 ))
 
 ifeq ($(COM),MSC)
-ifneq ($(USE_DEBUG_RUNTIME),)
 $(eval $(call gb_Library_add_libs,oleautobridge,\
-	$(ATL_LIB)/atlsd.lib \
+	$(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
 ))
-else
-$(eval $(call gb_Library_add_libs,oleautobridge,\
-	$(ATL_LIB)/atls.lib \
-))
-endif
 endif
 
 $(eval $(call gb_Library_add_exception_objects,oleautobridge,\

extensions/Library_so_activex.mk

@@ -65,14 +65,8 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\
 	uuid \
 ))
 
-ifneq ($(USE_DEBUG_RUNTIME),)
 $(eval $(call gb_Library_add_libs,so_activex,\
-	$(ATL_LIB)/atlsd.lib \
+	$(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
 ))
-else
-$(eval $(call gb_Library_add_libs,so_activex,\
-	$(ATL_LIB)/atls.lib \
-))
-endif
 
 # vim:set noet sw=4 ts=4:

extensions/Library_so_activex_x64.mk

@@ -68,14 +68,8 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 	uuid \
 ))
 
-ifneq ($(USE_DEBUG_RUNTIME),)
 $(eval $(call gb_Library_add_libs,so_activex_x64,\
-	$(ATL_LIB)/amd64/atlsd.lib \
+	$(ATL_LIB)/amd64/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
 ))
-else
-$(eval $(call gb_Library_add_libs,so_activex_x64,\
-	$(ATL_LIB)/amd64/atls.lib \
-))
-endif
 
 # vim:set noet sw=4 ts=4:

setup_native/Library_instooofiltmsi.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,instooofiltmsi,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,instooofiltmsi,\

setup_native/Library_qslnkmsi.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,qslnkmsi,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,qslnkmsi,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,qslnkmsi,\

setup_native/Library_reg4allmsdoc.mk

@@ -16,7 +16,7 @@ $(eval $(call gb_Library_add_defs,reg4allmsdoc,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\

setup_native/Library_regactivex.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,regactivex,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,regactivex,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,regactivex,\

setup_native/Library_regpatchactivex.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,regpatchactivex,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,regpatchactivex,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,regpatchactivex,\

setup_native/Library_sdqsmsi.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sdqsmsi,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,sdqsmsi,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,sdqsmsi,\

setup_native/Library_sellangmsi.mk

@@ -18,7 +18,7 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,sellangmsi,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,sellangmsi,\

setup_native/Library_shlxtmsi.mk

@@ -16,7 +16,7 @@ $(eval $(call gb_Library_add_defs,shlxtmsi,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,shlxtmsi,\

setup_native/Library_sn_tools.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sn_tools,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,sn_tools,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_Library_add_ldflags,sn_tools,\

setup_native/StaticLibrary_quickstarter.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_cxxflags,quickstarter,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,quickstarter,\

setup_native/StaticLibrary_seterror.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,seterror,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_cxxflags,seterror,\
-	/MT \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,seterror,\

solenv/gbuild/gbuild.mk

@@ -224,11 +224,10 @@ gb_GLOBALDEFS += \
 	-DLIBO_INTERNAL_ONLY \
 
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
-gb_GLOBALDEFS += -DDBG_UTIL \
-
-ifneq ($(COM),MSC)
-gb_GLOBALDEFS += -D_DEBUG \
+gb_GLOBALDEFS += -DDBG_UTIL
 
+ifneq ($(COM)-$(MSVC_USE_DEBUG_RUNTIME),MSC-)
+gb_GLOBALDEFS += -D_DEBUG
 endif
 endif
 

solenv/gbuild/platform/com_MSC_class.mk

@@ -218,8 +218,12 @@ $(call gb_Helper_abbreviate_dirs,\
 	; exit $$RC)
 endef
 
+define gb_MSVCRT_subst
+$(if $(MSVC_USE_DEBUG_RUNTIME),$(subst msvcrt,msvcrtd,$(subst msvcprt,msvcprtd,$(subst libcmt,libcmtd,$(subst libcpmt,libcpmtd,$(subst msvcmrt,msvcmrtd,$(1)))))),$(1))
+endef
+
 define gb_LinkTarget_use_system_win32_libs
-$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(lib).lib))
+$(call gb_LinkTarget_add_libs,$(1),$(foreach lib,$(2),$(call gb_MSVCRT_subst,$(lib)).lib))
 endef
 
 # Flags common for PE executables (EXEs and DLLs) 

solenv/gbuild/platform/com_MSC_defs.mk

@@ -148,7 +148,7 @@ gb_CFLAGS := \
 	-GR \
 	-Gs \
 	-GS \
-	-MD \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
 	-nologo \
 	-W4 \
 	-wd4127 \
@@ -181,7 +181,7 @@ gb_CXXFLAGS := \
 	-Gs \
 	-GS \
 	-Gy \
-	-MD \
+	$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
 	-nologo \
 	-W4 \
 	-wd4127 \

solenv/gcc-wrappers/wrapper.cxx

@@ -72,7 +72,11 @@ string processccargs(vector<string> rawargs) {
     string args=" -nologo";
     // TODO: should these options be enabled globally?
     args.append(" -EHsc");
-    args.append(" -MD");
+    const char *const pDebugRuntime(getenv("MSVC_USE_DEBUG_RUNTIME"));
+    if (pDebugRuntime && !strcmp(pDebugRuntime, "TRUE"))
+        args.append(" -MDd");
+    else
+        args.append(" -MD");
     args.append(" -Gy");
     args.append(" -Zc:wchar_t-");
     args.append(" -Ob1 -Oxs -Oy-");