Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve boost #4135 #4152

Merged
merged 1 commit into from
May 25, 2024
Merged

improve boost #4135 #4152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/b/boost/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,16 @@ package("boost")
local build_toolset
local runenvs
if package:is_plat("windows") then
build_toolchain = package:toolchain("clang-cl") or package:toolchain("msvc") or
toolchain.load("msvc", {plat = package:plat(), arch = package:arch()})
assert(build_toolchain:check(), "build toolchain not found!")
build_toolset = build_toolchain:name() == "clang-cl" and "clang-win" or "msvc"
runenvs = build_toolchain:runenvs()
if package:has_tool("cxx", "clang_cl") then
build_toolset = "clang-win"
build_toolchain = package:toolchain("clang-cl")
elseif package:has_tool("cxx", "cl") then
build_toolset = "msvc"
build_toolchain = package:toolchain("msvc")
end
if build_toolchain then
runenvs = build_toolchain:runenvs()
end
end

local file = io.open("user-config.jam", "w")
Expand Down
Loading