From 2fd4e41d59a080947c06e0c50871aaba24a7276c Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 29 May 2024 09:39:13 +0800 Subject: [PATCH] boost: fix v144 toolset (#4182) --- packages/b/boost/xmake.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 5d508f4a5..c1c757298 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -343,6 +343,18 @@ package("boost") table.insert(argv, "pch=off") end + if package:is_plat("windows") and package:version():le("1.85.0") then + local vs_toolset = build_toolchain:config("vs_toolset") + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + if minor and minor >= 40 then + io.replace("tools/build/src/engine/config_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/build.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/guess_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/tools/intel-win.jam", "14.3", "14.4", {plain = true}) + io.replace("tools/build/src/tools/msvc.jam", "14.3", "14.4", {plain = true}) + end + end local ok = os.execv("./b2", argv, {envs = runenvs, try = true, stdout = "boost-log.txt"}) if ok ~= 0 then raise("boost build failed, please check log in " .. path.join(os.curdir(), "boost-log.txt"))