firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

Fix #8251 No artifacts produced from windows builds since VS 2022 was upgraded to v17.10

Browse Source
This commit is contained in:
Paul Reeves 2024-09-17 15:36:52 +02:00
parent 3c253ccba6
commit 5196d89d25
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builds/win32/setenvvar.bat
View File

@ -110,9 +110,19 @@ for %%v in ( %* ) do (
:: Note that VCToolsVersion is only defined after vcvarsall.bat been run. :: Note that VCToolsVersion is only defined after vcvarsall.bat been run.
@if defined VCToolsVersion ( @if defined VCToolsVersion (
set MSVC_RUNTIME_MAJOR_VERSION=%VCToolsVersion:~0,2% set MSVC_RUNTIME_MAJOR_VERSION=%VCToolsVersion:~0,2%
set MSVC_RUNTIME_MINOR_VERSION=%VCToolsVersion:~3,1%
set MSVC_RUNTIME_LIBRARY_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%
set MSVC_RUNTIME_FILE_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%0 set MSVC_RUNTIME_FILE_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%0
rem NOTE 1 Since the upgrade to VS 17.10.5 this attempt to set the runtime minor
rem version is broken as it now returns '4'. Note also that vcvars.bat has v143
rem hard-coded. It does not seem to be possible to dynamically derived the minor
rem version using the available env vars so we test to see if the runtime dir
rem exists and if not we fall back to 3.
rem NOTE 2 This code is likely to break again in the future !!!!
set MSVC_RUNTIME_MINOR_VERSION=%VCToolsVersion:~3,1%
if not exist %VCToolsRedistDir%%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%.CRT (
set MSVC_RUNTIME_MINOR_VERSION=3
)
set MSVC_RUNTIME_LIBRARY_VERSION=%MSVC_RUNTIME_MAJOR_VERSION%%MSVC_RUNTIME_MINOR_VERSION%
) )
@echo. @echo.