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

targos · richardlau · commit 6962c647d6c1 · 2021-07-20T07:11:36.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
@@ -372,8 +372,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
`@@ -372,8 +372,6 @@ if "%target%"=="Build" (`
`372`	`372`	`if defined cctest set target="Build"`
`373`	`373`	`)`
`374`	`374`	`if "%target%"=="node" if exist "%config%\cctest.exe" del "%config%\cctest.exe"`
`375`		`-@rem TODO(targos): Remove next line after MSBuild 16.10.1 is released.`
`376`		`-if "%target%"=="node" set target="Build"`
`377`	`375`	`if defined msbuild_args set "extra_msbuild_args=%extra_msbuild_args% %msbuild_args%"`
`378`	`376`	`@rem Setup env variables to use multiprocessor build`
`379`	`377`	`set UseMultiToolTask=True`