Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 42290)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 42291)
@@ -451,5 +451,5 @@
 		-E 'BUILD_TYPE=$(KBUILD_TYPE)' \
 		-E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
-		-E 'VBOX_USE_$(VBOX_VCC_TOOL_STEM)=yes' \
+		-E 'VBOX_VCC_TOOL_STEM=$(VBOX_VCC_TOOL_STEM)' \
 		-- \
 		$(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 42290)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 42291)
@@ -527,5 +527,5 @@
 <?endif?>
 
-<?if $(env.VBOX_USE_VCC100) = "yes" ?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
                         <!-- MS C/C++ v10.0 Runtime DLL files. -->
                         <File Id="file_msvcr100.dll" Name="msvcr100.dll"
@@ -534,5 +534,5 @@
                               Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
 <?endif?>
-<?if $(env.VBOX_USE_VCC110) = "yes" ?>
+<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
                         <!-- MS C/C++ v11.0 Runtime DLL files. -->
                         <File Id="file_msvcr110.dll" Name="msvcr110.dll"