Skip to content

Commit f2a03ff

Browse files
committed
Fixed bug #8292 : run_all PDB fails with "Error calling COPY_XTRA"
1 parent eb44a7e commit f2a03ff

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
@@ -119,8 +119,14 @@ rem version using the available env vars so we test to see if the runtime dir
119119
rem exists and if not we fall back to 3.
120120
rem NOTE 2 This code is likely to break again in the future !!!!
121121
set MSVC_RUNTIME_MINOR_VERSION=%VCToolsVersion:~3,1%
122-
if not exist "%VCToolsRedistDir%%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%.CRT" (
122+
123+
@setlocal EnableDelayedExpansion
124+
125+
if not exist "!VCToolsRedistDir!!VSCMD_ARG_TGT_ARCH!\Microsoft.VC!MSVC_RUNTIME_MAJOR_VERSION!!MSVC_RUNTIME_MINOR_VERSION!.CRT" (
126+
@endlocal
123127
set MSVC_RUNTIME_MINOR_VERSION=3
128+
) else (
129+
@endlocal
124130
)
125131
set MSVC_RUNTIME_LIBRARY_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%
126132

0 commit comments

Comments
 (0)