boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-01-19 16:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'bfgroup.b2/release' into develop

Browse Source
This commit is contained in:
Rene Rivera
2025-12-21 23:19:22 -06:00
parent fd3f593346 7e64ad6318
commit 85252c9d6a
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/history.adoc
View File

@@ -1,6 +1,11 @@
[[b2.history]]
= History
== Version 5.4.2
Fix detection of Visual Studio 2026 to account for non-native tools being
installed by default and hence conflicting with the native tools.
== Version 5.4.1
Fix error in path environment variables not being properly processed to split

2
src/build/version.jam
View File

@@ -10,7 +10,7 @@ import numbers ;
# Mirror engine JAM_VERSION
.major = 5 ;
.minor = 4 ;
.patch = 1 ;
.patch = 2 ;
rule build ( )

2
src/engine/patchlevel.h
View File

@@ -14,4 +14,4 @@ https://www.bfgroup.xyz/b2/LICENSE.txt)
#define VERSION_MAJOR 5
#define VERSION_MINOR 4
#define VERSION_PATCH 1
#define VERSION_PATCH 2

36
src/tools/msvc.jam
View File

@@ -2164,11 +2164,25 @@ for local cpu in [ MATCH "^\\.cpu-arch-info-(.*)" : [ VARNAMES $(__name__) ] ]
.default-cpu-arch = [ os.environ PROCESSOR_ARCHITEW6432 ] ;
.default-cpu-arch ?= [ os.environ PROCESSOR_ARCHITECTURE ] ;
.default-cpu-arch = $(.default-cpu-arch:L) ;
.host-arch = x86 ;
switch $(.default-cpu-arch)
{
case x86 : .default-cpu-arch = i386 ;
case em64t : .default-cpu-arch = amd64 ;
case arm64 : .default-cpu-arch = arm64 ;
case x86 :
.default-cpu-arch = i386 ;
case em64t :
.default-cpu-arch = amd64 ;
.host-arch = x64 ;
case arm64 :
.default-cpu-arch = arm64 ;
.host-arch = arm64 ;
case amd64 :
.host-arch = x64 ;
case ia64 :
.host-arch = x64 ;
}
for local cpu in $(.cpus-on-$(.cpu-arch-info-$(.default-cpu-arch)[1]))
@@ -2253,23 +2267,23 @@ for local arch in [ MATCH "^\\.cpus-on-(.*)" : [ VARNAMES $(__name__) ] ]
# of discovery involve having a compiled program. So as a fallback we search
# paths for VS2017 (aka msvc >= 14.1).
.version-14.1-path =
"../../VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/2017/*/VC/Tools/MSVC/*/bin/Host*/*" ;
"../../VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)"
"Microsoft Visual Studio/2017/*/VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)" ;
.version-14.1-env = VS150COMNTOOLS ProgramFiles ProgramFiles(x86) ;
.version-14.2-path =
"../../VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/2019/*/VC/Tools/MSVC/*/bin/Host*/*" ;
"../../VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)"
"Microsoft Visual Studio/2019/*/VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)" ;
.version-14.2-env = VS160COMNTOOLS ProgramFiles ProgramFiles(x86) ;
.version-14.3-path =
"../../VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/2022/*/VC/Tools/MSVC/*/bin/Host*/*" ;
"../../VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)"
"Microsoft Visual Studio/2022/*/VC/Tools/MSVC/*/bin/Host$(.host-arch)/$(.host-arch)" ;
.version-14.3-env = VS170COMNTOOLS ProgramFiles ProgramFiles(x86) ;
.version-14.5-path =
"../../VC/Tools/MSVC/*/bin/Host*/*"
"Microsoft Visual Studio/18/*/VC/Tools/MSVC/14.5*/bin/Host*/*" ;
"../../VC/Tools/MSVC/14.5*/bin/Host$(.host-arch)/$(.host-arch)"
"Microsoft Visual Studio/18/*/VC/Tools/MSVC/14.5*/bin/Host$(.host-arch)/$(.host-arch)" ;
.version-14.5-env = VS180COMNTOOLS ProgramFiles ProgramFiles(x86) ;