Skip to content

add llvm 21.1.0 #8399

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

Merged
merged 1 commit into from
Oct 26, 2025
Merged

add llvm 21.1.0 #8399

Show file tree
Hide file tree
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
12 changes: 9 additions & 3 deletions packages/l/llvm/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package("llvm")
add_configs("pstl", {description = "Enable pstl project.", default = false, type = "boolean"})
add_configs("mlir", {description = "Enable mlir project.", default = false, type = "boolean"})
add_configs("flang", {description = "Enable flang project.", default = false, type = "boolean"})
add_configs("compiler-rt", {description = "Enable compiler-rt project.", default = true, type = "boolean"})

add_configs("compiler-rt", {description = "Enable compiler-rt runtime.", default = true, type = "boolean"})
add_configs("libunwind", {description = "Enable libunwind runtime.", default = true, type = "boolean"})
add_configs("libc", {description = "Enable libc runtime.", default = false, type = "boolean"})
add_configs("libcxx", {description = "Enable libcxx runtime.", default = true, type = "boolean"})
Expand All @@ -35,6 +35,7 @@ package("llvm")
package:add("versions", "16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818")
package:add("versions", "17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41")
package:add("versions", "18.1.1", "1e21b088b1f86aebb4a2e4ad473d1892dccab53ecbe06947f31c6fa56a078bf5")
package:add("versions", "21.1.0", "36b9a55e237b2db404aa621aacb8538b56dabc6f49b8927dc1109e8123524d5f")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line adds the new version for Windows x86. However, the same version and hash are also added on line 76 for older xmake versions. This duplication makes maintenance harder and the script more error-prone. It would be better to define versions in a shared data structure (like a table) and populate them in both code paths to avoid redundancy.

precompiled = true
else
package:set("urls", "https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip")
Expand All @@ -44,6 +45,7 @@ package("llvm")
package:add("versions", "16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3")
package:add("versions", "17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187")
package:add("versions", "18.1.1", "7040c7a02529bc0c683896d4f851138b700d8aa8f40c5f48503b10f4cc2dc180")
package:add("versions", "21.1.0", "130d0067de849be36c0ec84c6d515bd310cab324a4cc95d8cc71a1d3c6c730f4")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Similar to the win32 case, this line adds the new version for Windows x64, which is duplicated on line 86. This redundancy increases the maintenance burden and risk of inconsistencies. Consolidating version definitions would improve the script's maintainability.

precompiled = true
end
end
Expand All @@ -56,6 +58,7 @@ package("llvm")
package:add("versions", "16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e")
package:add("versions", "17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813")
package:add("versions", "18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad")
package:add("versions", "21.1.0", "1672e3efb4c2affd62dbbe12ea898b28a451416c7d95c1bd0190c26cbe878825")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line adds the new source version, which is also duplicated on line 99. To avoid maintenance issues, it's recommended to define all versions in a single, shared data structure and reference it from both the modern on_source block and the legacy else block.

end
end)
else
Expand All @@ -70,6 +73,7 @@ package("llvm")
add_versions("16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818")
add_versions("17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41")
add_versions("18.1.1", "1e21b088b1f86aebb4a2e4ad473d1892dccab53ecbe06947f31c6fa56a078bf5")
add_versions("21.1.0", "36b9a55e237b2db404aa621aacb8538b56dabc6f49b8927dc1109e8123524d5f")
precompiled = true
else
set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip")
Expand All @@ -79,6 +83,7 @@ package("llvm")
add_versions("16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3")
add_versions("17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187")
add_versions("18.1.1", "7040c7a02529bc0c683896d4f851138b700d8aa8f40c5f48503b10f4cc2dc180")
add_versions("21.1.0", "130d0067de849be36c0ec84c6d515bd310cab324a4cc95d8cc71a1d3c6c730f4")
precompiled = true
end
end
Expand All @@ -91,6 +96,7 @@ package("llvm")
add_versions("16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e")
add_versions("17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813")
add_versions("18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad")
add_versions("21.1.0", "1672e3efb4c2affd62dbbe12ea898b28a451416c7d95c1bd0190c26cbe878825")
end
end

Expand Down Expand Up @@ -126,7 +132,7 @@ package("llvm")
os.cp("*", package:installdir())
end)

on_install("linux", "macosx|x86_64", "bsd", function (package)
on_install("linux", "macosx", "bsd", function (package)
local projects = {
"bolt",
"clang",
Expand All @@ -139,7 +145,6 @@ package("llvm")
"pstl",
"mlir",
"flang",
"compiler-rt",
"openmp"
}
local projects_enabled = {}
Expand All @@ -153,6 +158,7 @@ package("llvm")
end
end
local runtimes = {
"compiler-rt",
"libc",
"libunwind",
"libcxx",
Expand Down
6 changes: 5 additions & 1 deletion scripts/test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,11 @@ function get_modified_packages()
if #packages > 0 and version then
local lastpackage = packages[#packages]
local splitinfo = lastpackage:split("%s+")
table.insert(packages, splitinfo[1] .. " " .. version)
if #splitinfo > 1 then
table.insert(packages, splitinfo[1] .. " " .. version)
else
packages[#packages] = splitinfo[1] .. " " .. version
end
end
end
end
Expand Down
Loading