Skip to content

Commit 33b4036

Browse files
committed
Fixed bug #8292 : run_all PDB fails with "Error calling COPY_XTRA"
1 parent 6bfd79f commit 33b4036

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

builds/win32/setenvvar.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,14 @@ rem version using the available env vars so we test to see if the runtime dir
118118
rem exists and if not we fall back to 3.
119119
rem NOTE 2 This code is likely to break again in the future !!!!
120120
set MSVC_RUNTIME_MINOR_VERSION=%VCToolsVersion:~3,1%
121-
if not exist "%VCToolsRedistDir%%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%.CRT" (
121+
122+
@setlocal EnableDelayedExpansion
123+
124+
if not exist "!VCToolsRedistDir!!VSCMD_ARG_TGT_ARCH!\Microsoft.VC!MSVC_RUNTIME_MAJOR_VERSION!!MSVC_RUNTIME_MINOR_VERSION!.CRT" (
125+
@endlocal
122126
set MSVC_RUNTIME_MINOR_VERSION=3
127+
) else (
128+
@endlocal
123129
)
124130
set MSVC_RUNTIME_LIBRARY_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%
125131

0 commit comments

Comments
 (0)