Skip to content

Commit d311453

Browse files
committed
update llvm
1 parent af695e2 commit d311453

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

packages/l/llvm/xmake.lua

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package("llvm")
1515
add_configs("pstl", {description = "Enable pstl project.", default = false, type = "boolean"})
1616
add_configs("mlir", {description = "Enable mlir project.", default = false, type = "boolean"})
1717
add_configs("flang", {description = "Enable flang project.", default = false, type = "boolean"})
18-
add_configs("compiler-rt", {description = "Enable compiler-rt project.", default = true, type = "boolean"})
1918

19+
add_configs("compiler-rt", {description = "Enable compiler-rt runtime.", default = true, type = "boolean"})
2020
add_configs("libunwind", {description = "Enable libunwind runtime.", default = true, type = "boolean"})
2121
add_configs("libc", {description = "Enable libc runtime.", default = false, type = "boolean"})
2222
add_configs("libcxx", {description = "Enable libcxx runtime.", default = true, type = "boolean"})
@@ -35,6 +35,7 @@ package("llvm")
3535
package:add("versions", "16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818")
3636
package:add("versions", "17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41")
3737
package:add("versions", "18.1.1", "1e21b088b1f86aebb4a2e4ad473d1892dccab53ecbe06947f31c6fa56a078bf5")
38+
package:add("versions", "21.1.0", "36b9a55e237b2db404aa621aacb8538b56dabc6f49b8927dc1109e8123524d5f")
3839
precompiled = true
3940
else
4041
package:set("urls", "https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip")
@@ -44,6 +45,7 @@ package("llvm")
4445
package:add("versions", "16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3")
4546
package:add("versions", "17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187")
4647
package:add("versions", "18.1.1", "7040c7a02529bc0c683896d4f851138b700d8aa8f40c5f48503b10f4cc2dc180")
48+
package:add("versions", "21.1.0", "130d0067de849be36c0ec84c6d515bd310cab324a4cc95d8cc71a1d3c6c730f4")
4749
precompiled = true
4850
end
4951
end
@@ -56,6 +58,7 @@ package("llvm")
5658
package:add("versions", "16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e")
5759
package:add("versions", "17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813")
5860
package:add("versions", "18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad")
61+
package:add("versions", "21.1.0", "1672e3efb4c2affd62dbbe12ea898b28a451416c7d95c1bd0190c26cbe878825")
5962
end
6063
end)
6164
else
@@ -70,6 +73,7 @@ package("llvm")
7073
add_versions("16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818")
7174
add_versions("17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41")
7275
add_versions("18.1.1", "1e21b088b1f86aebb4a2e4ad473d1892dccab53ecbe06947f31c6fa56a078bf5")
76+
add_versions("21.1.0", "36b9a55e237b2db404aa621aacb8538b56dabc6f49b8927dc1109e8123524d5f")
7377
precompiled = true
7478
else
7579
set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip")
@@ -79,6 +83,7 @@ package("llvm")
7983
add_versions("16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3")
8084
add_versions("17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187")
8185
add_versions("18.1.1", "7040c7a02529bc0c683896d4f851138b700d8aa8f40c5f48503b10f4cc2dc180")
86+
add_versions("21.1.0", "130d0067de849be36c0ec84c6d515bd310cab324a4cc95d8cc71a1d3c6c730f4")
8287
precompiled = true
8388
end
8489
end
@@ -91,6 +96,7 @@ package("llvm")
9196
add_versions("16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e")
9297
add_versions("17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813")
9398
add_versions("18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad")
99+
add_versions("21.1.0", "1672e3efb4c2affd62dbbe12ea898b28a451416c7d95c1bd0190c26cbe878825")
94100
end
95101
end
96102

@@ -126,7 +132,7 @@ package("llvm")
126132
os.cp("*", package:installdir())
127133
end)
128134

129-
on_install("linux", "macosx|x86_64", "bsd", function (package)
135+
on_install("linux", "macosx", "bsd", function (package)
130136
local projects = {
131137
"bolt",
132138
"clang",
@@ -139,7 +145,6 @@ package("llvm")
139145
"pstl",
140146
"mlir",
141147
"flang",
142-
"compiler-rt",
143148
"openmp"
144149
}
145150
local projects_enabled = {}
@@ -153,6 +158,7 @@ package("llvm")
153158
end
154159
end
155160
local runtimes = {
161+
"compiler-rt",
156162
"libc",
157163
"libunwind",
158164
"libcxx",

scripts/test.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,11 @@ function get_modified_packages()
280280
if #packages > 0 and version then
281281
local lastpackage = packages[#packages]
282282
local splitinfo = lastpackage:split("%s+")
283-
table.insert(packages, splitinfo[1] .. " " .. version)
283+
if #splitinfo > 1 then
284+
table.insert(packages, splitinfo[1] .. " " .. version)
285+
else
286+
packages[#packages] = splitinfo[1] .. " " .. version
287+
end
284288
end
285289
end
286290
end

0 commit comments

Comments
 (0)