Revert "build: work around bug in MSBuild v16.10.0"

targos · danielleadams · commit 7f225a05eefa · 2021-06-21T11:08:06.000-04:00
This reverts commit 3457130. Visual Studio v16.10.1 is out. Closes: #38872 PR-URL: #38977 Fixes: #38872 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -334,8 +334,6 @@ if "%target%"=="Build" (
 if defined cctest set target="Build"
 )
 if "%target%"=="node" if exist "%config%\cctest.exe" del "%config%\cctest.exe"
-@rem TODO(targos): Remove next line after MSBuild 16.10.1 is released.
-if "%target%"=="node" set target="Build"
 if defined msbuild_args set "extra_msbuild_args=%extra_msbuild_args% %msbuild_args%"
 @rem Setup env variables to use multiprocessor build
 set UseMultiToolTask=True

Original file line number	Diff line number	Diff line change
`@@ -334,8 +334,6 @@ if "%target%"=="Build" (`
`334`	`334`	`ifdefined cctest settarget="Build"`
`335`	`335`	`)`
`336`	`336`	`if"%target%"=="node"ifexist"%config%\cctest.exe"del"%config%\cctest.exe"`
`337`		`-@rem TODO(targos): Remove next line after MSBuild 16.10.1 is released.`
`338`		`-if"%target%"=="node"settarget="Build"`
`339`	`337`	`ifdefined msbuild_args set"extra_msbuild_args=%extra_msbuild_args%%msbuild_args%"`
`340`	`338`	`@rem Setup env variables to use multiprocessor build`
`341`	`339`	`setUseMultiToolTask=True`