Skip to content

Commit cae7ba0

Browse files
calebzulawskicalebzulawski
committed
Update toolchain assets and make use of tools in CMake
1 parent 01b873c commit cae7ba0

File tree

3 files changed

+42
-40
lines changed

3 files changed

+42
-40
lines changed

‎bazel/detail/assets/assets.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
[
22
{
33
"name": "compiler-rt-linux",
4-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/compiler-rt-linux.tar.xz",
5-
"integrity": "sha256-TLoykNTnpEpYsEVVoHECqJ9ybuCeYoMwoX3nC9nskhc="
4+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/compiler-rt-linux.tar.xz",
5+
"integrity": "sha256-DOfLl6olPjW+mCDqL9jHK1q4fvmwSBnSCF4mkSKi1Wk="
66
},
77
{
88
"name": "llvm-aarch64-unknown-linux-gnu",
9-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-aarch64-unknown-linux-gnu.tar.xz",
10-
"integrity": "sha256-BVeVsUUW/sPqrj2xqfnp6pqMwg5xuwBV/ysRiCxsCE0="
9+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-aarch64-unknown-linux-gnu.tar.xz",
10+
"integrity": "sha256-K7cjNloiBqzxv87Q3oXrK2ha2rLqlM53+us0CW+X6PM="
1111
},
1212
{
1313
"name": "llvm-arm64-apple-macos",
14-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-arm64-apple-macos.tar.xz",
15-
"integrity": "sha256-P6+DbQfFPvBdDBIMNc0ICtbJSOPPKuAxX/oo2x0pZ24="
14+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-arm64-apple-macos.tar.xz",
15+
"integrity": "sha256-Cf+99OOOWE5ZPUwjinGWZKRuXKUl9raRJLFoggXNBK4="
1616
},
1717
{
1818
"name": "llvm-x86_64-apple-macos",
19-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-apple-macos.tar.xz",
20-
"integrity": "sha256-szuhV23mQRobymsx+nJcLfRxv4/JCIXburuwAc6U7gc="
19+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-apple-macos.tar.xz",
20+
"integrity": "sha256-bvjxgglCTe+owre1f0gTCtWrEBAp0kFhi1o7ZxlgVdU="
2121
},
2222
{
2323
"name": "llvm-x86_64-pc-windows-msvc",
24-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-pc-windows-msvc.tar.xz",
25-
"integrity": "sha256-qN8yjRWgvgXhhmogHKaL+KBHdJr4+y3rvC4ZjZW2R0c="
24+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-pc-windows-msvc.tar.xz",
25+
"integrity": "sha256-nhXzRW4t04mT+1VRd9I3FMTCS0jzimxN5Er1+oTU88w="
2626
},
2727
{
2828
"name": "llvm-x86_64-unknown-linux-gnu",
29-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-unknown-linux-gnu.tar.xz",
30-
"integrity": "sha256-dysPWCy5yEYyKgBH0OX8YBKnHNh1yYcCWkMUP7MworE="
29+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-unknown-linux-gnu.tar.xz",
30+
"integrity": "sha256-Z6hz2iWKYVN/+Uki9aLyTUO4OsKemaqry1f+exRo4Vs="
3131
},
3232
{
3333
"name": "sysroot-aarch64-unknown-linux-gnu",
34-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-aarch64-unknown-linux-gnu.tar.xz",
35-
"integrity": "sha256-cIqyCo4dLUTxG3ymb2uJGLW7NdjvLNoI2yvJZ7rniLI="
34+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-aarch64-unknown-linux-gnu.tar.xz",
35+
"integrity": "sha256-l0Fe71lcl9jS9ba5/mExLMIzL/dj12peSBu7XEK2Z70="
3636
},
3737
{
3838
"name": "sysroot-aarch64-unknown-linux-musl",
39-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-aarch64-unknown-linux-musl.tar.xz",
39+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-aarch64-unknown-linux-musl.tar.xz",
4040
"integrity": "sha256-8ZFZV5nRZMbsmQMWX63sxtUpJoOALw0hl10QN0fFdYk="
4141
},
4242
{
4343
"name": "sysroot-armv7-unknown-linux-gnueabihf",
44-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-armv7-unknown-linux-gnueabihf.tar.xz",
45-
"integrity": "sha256-AKHUNEUdmkskqLDx8HCdawCwnhHkCZ2ZDeHc7retpPU="
44+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-armv7-unknown-linux-gnueabihf.tar.xz",
45+
"integrity": "sha256-kA/UKIAe6h+nefq5xtcOhmf2oF6uSDwBSXwBuDXtE/Q="
4646
},
4747
{
4848
"name": "sysroot-x86_64-unknown-linux-gnu",
49-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-x86_64-unknown-linux-gnu.tar.xz",
50-
"integrity": "sha256-hKmT9FZTw7RY2OwTv0XAWhaTNIrDdnRPt1A5AAYLyVA="
49+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-x86_64-unknown-linux-gnu.tar.xz",
50+
"integrity": "sha256-xSAzNRfKvMQTA7LDxmAUWA6B7WR/dyNHSucoYnUaU3s="
5151
},
5252
{
5353
"name": "sysroot-x86_64-unknown-linux-musl",
54-
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-x86_64-unknown-linux-musl.tar.xz",
54+
"url": "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-x86_64-unknown-linux-musl.tar.xz",
5555
"integrity": "sha256-W15hGFCCFrUNVjSc6BABJtMjzxAe+Mapv8qeVQHeyjE="
5656
}
5757
]

‎cmake/portable_cc_toolchain/private/assets.cmake‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
set(_ASSET_URL_compiler-rt-linux "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/compiler-rt-linux.tar.xz")
2-
set(_ASSET_SHA256_compiler-rt-linux 4cba3290d4e7a44a58b04555a07102a89f726ee09e628330a17de70bd9ec9217)
1+
set(_ASSET_URL_compiler-rt-linux "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/compiler-rt-linux.tar.xz")
2+
set(_ASSET_SHA256_compiler-rt-linux 0ce7cb97aa253e35be9820ea2fd8c72b5ab87ef9b04819d2085e269122a2d569)
33

4-
set(_ASSET_URL_llvm-aarch64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-aarch64-unknown-linux-gnu.tar.xz")
5-
set(_ASSET_SHA256_llvm-aarch64-unknown-linux-gnu 055795b14516fec3eaae3db1a9f9e9ea9a8cc20e71bb0055ff2b11882c6c084d)
4+
set(_ASSET_URL_llvm-aarch64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-aarch64-unknown-linux-gnu.tar.xz")
5+
set(_ASSET_SHA256_llvm-aarch64-unknown-linux-gnu 2bb723365a2206acf1bfced0de85eb2b685adab2ea94ce77faeb34096f97e8f3)
66

7-
set(_ASSET_URL_llvm-arm64-apple-macos "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-arm64-apple-macos.tar.xz")
8-
set(_ASSET_SHA256_llvm-arm64-apple-macos 3faf836d07c53ef05d0c120c35cd080ad6c948e3cf2ae0315ffa28db1d29676e)
7+
set(_ASSET_URL_llvm-arm64-apple-macos "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-arm64-apple-macos.tar.xz")
8+
set(_ASSET_SHA256_llvm-arm64-apple-macos 09ffbdf4e38e584e593d4c238a719664a46e5ca525f6b69124b1688205cd04ae)
99

10-
set(_ASSET_URL_llvm-x86_64-apple-macos "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-apple-macos.tar.xz")
11-
set(_ASSET_SHA256_llvm-x86_64-apple-macos b33ba1576de6411a1bca6b31fa725c2df471bf8fc90885dbbabbb001ce94ee07)
10+
set(_ASSET_URL_llvm-x86_64-apple-macos "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-apple-macos.tar.xz")
11+
set(_ASSET_SHA256_llvm-x86_64-apple-macos 6ef8f18209424defa8c2b7b57f48130ad5ab101029d241618b5a3b67196055d5)
1212

13-
set(_ASSET_URL_llvm-x86_64-pc-windows-msvc "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-pc-windows-msvc.tar.xz")
14-
set(_ASSET_SHA256_llvm-x86_64-pc-windows-msvc a8df328d15a0be05e1866a201ca68bf8a047749af8fb2debbc2e198d95b64747)
13+
set(_ASSET_URL_llvm-x86_64-pc-windows-msvc "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-pc-windows-msvc.tar.xz")
14+
set(_ASSET_SHA256_llvm-x86_64-pc-windows-msvc 9e15f3456e2dd38993fb555177d23714c4c24b48f38a6c4de44af5fa84d4f3cc)
1515

16-
set(_ASSET_URL_llvm-x86_64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/llvm-x86_64-unknown-linux-gnu.tar.xz")
17-
set(_ASSET_SHA256_llvm-x86_64-unknown-linux-gnu 772b0f582cb9c846322a0047d0e5fc6012a71cd875c987025a43143fb330a2b1)
16+
set(_ASSET_URL_llvm-x86_64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/llvm-x86_64-unknown-linux-gnu.tar.xz")
17+
set(_ASSET_SHA256_llvm-x86_64-unknown-linux-gnu 67a873da258a61537ff94922f5a2f24d43b83ac29e99aaabcb57fe7b1468e15b)
1818

19-
set(_ASSET_URL_sysroot-aarch64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-aarch64-unknown-linux-gnu.tar.xz")
20-
set(_ASSET_SHA256_sysroot-aarch64-unknown-linux-gnu 708ab20a8e1d2d44f11b7ca66f6b8918b5bb35d8ef2cda08db2bc967bae788b2)
19+
set(_ASSET_URL_sysroot-aarch64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-aarch64-unknown-linux-gnu.tar.xz")
20+
set(_ASSET_SHA256_sysroot-aarch64-unknown-linux-gnu 97415eef595c97d8d2f5b6b9fe61312cc2332ff763d76a5e481bbb5c42b667bd)
2121

22-
set(_ASSET_URL_sysroot-aarch64-unknown-linux-musl "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-aarch64-unknown-linux-musl.tar.xz")
22+
set(_ASSET_URL_sysroot-aarch64-unknown-linux-musl "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-aarch64-unknown-linux-musl.tar.xz")
2323
set(_ASSET_SHA256_sysroot-aarch64-unknown-linux-musl f191595799d164c6ec9903165fadecc6d5292683802f0d21975d103747c57589)
2424

25-
set(_ASSET_URL_sysroot-armv7-unknown-linux-gnueabihf "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-armv7-unknown-linux-gnueabihf.tar.xz")
26-
set(_ASSET_SHA256_sysroot-armv7-unknown-linux-gnueabihf 00a1d434451d9a4b24a8b0f1f0709d6b00b09e11e4099d990de1dceeb7ada4f5)
25+
set(_ASSET_URL_sysroot-armv7-unknown-linux-gnueabihf "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-armv7-unknown-linux-gnueabihf.tar.xz")
26+
set(_ASSET_SHA256_sysroot-armv7-unknown-linux-gnueabihf 900fd428801eea1fa779fab9c6d70e8667f6a05eae483c01497c01b835ed13f4)
2727

28-
set(_ASSET_URL_sysroot-x86_64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-x86_64-unknown-linux-gnu.tar.xz")
29-
set(_ASSET_SHA256_sysroot-x86_64-unknown-linux-gnu 84a993f45653c3b458d8ec13bf45c05a1693348ac376744fb7503900060bc950)
28+
set(_ASSET_URL_sysroot-x86_64-unknown-linux-gnu "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-x86_64-unknown-linux-gnu.tar.xz")
29+
set(_ASSET_SHA256_sysroot-x86_64-unknown-linux-gnu c520333517cabcc41303b2c3c66014580e81ed647f7723474ae72862751a537b)
3030

31-
set(_ASSET_URL_sysroot-x86_64-unknown-linux-musl "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.07.27/sysroot-x86_64-unknown-linux-musl.tar.xz")
31+
set(_ASSET_URL_sysroot-x86_64-unknown-linux-musl "https://github.com/CACI-International/cpp-toolchain/releases/download/toolchain-2025.08.05/sysroot-x86_64-unknown-linux-musl.tar.xz")
3232
set(_ASSET_SHA256_sysroot-x86_64-unknown-linux-musl 5b5e6118508216b50d56349ce8100126d323cf101ef8c6a9bfca9e5501deca31)
3333

‎cmake/portable_cc_toolchain/toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,13 @@ else()
107107
endif()
108108

109109
set(CMAKE_RANLIB "${_llvm_dir}/bin/llvm-ranlib${_exe}" CACHE FILEPATH "")
110+
set(CMAKE_MT "${_llvm_dir}/bin/llvm-mt${_exe}" CACHE FILEPATH "")
110111
set(CMAKE_NM "${_llvm_dir}/bin/llvm-nm${_exe}" CACHE FILEPATH "")
111112
set(CMAKE_STRIP "${_llvm_dir}/bin/llvm-strip${_exe}" CACHE FILEPATH "")
112113
set(CMAKE_OBJCOPY "${_llvm_dir}/bin/llvm-objcopy${_exe}" CACHE FILEPATH "")
113114
set(CMAKE_OBJDUMP "${_llvm_dir}/bin/llvm-objdump${_exe}" CACHE FILEPATH "")
114115
set(CMAKE_READELF "${_llvm_dir}/bin/llvm-readelf${_exe}" CACHE FILEPATH "")
116+
set(CMAKE_RC_COMPILER "${_llvm_dir}/bin/llvm-rc${_exe}" CACHE FILEPATH "")
115117
set(CMAKE_INSTALL_NAME_TOOL "${_llvm_dir}/bin/llvm-install-name-tool${_exe}" CACHE FILEPATH "")
116118

117119
set(CMAKE_ASM_FLAGS "--target=${TARGET_TRIPLE}")

0 commit comments

Comments
 (0)