Skip to content

Commit a611e25

Browse files
authored
chore(deps): update clang to 21.1.6.0 (#661)
update clang to 21.1.6.0 The riscv64 image is also updated in order to remove the workaround from `scripts/install-static-clang.sh` and use `CMAKE_LINKER_TYPE` instead.
1 parent c89cf39 commit a611e25

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ if(CMakePythonDistributions_SUPERBUILD)
243243
CMAKE_JOB_POOLS
244244
CMAKE_JOB_POOL_COMPILE
245245
CMAKE_JOB_POOL_LINK
246+
CMAKE_LINKER_TYPE
246247
)
247248
if(DEFINED ${var_name})
248249
list(APPEND _cmake_cache_args

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ manylinux-aarch64-image = "manylinux2014"
105105
manylinux-ppc64le-image = "manylinux2014"
106106
manylinux-s390x-image = "manylinux2014"
107107
manylinux-armv7l-image = "manylinux_2_31"
108-
manylinux-riscv64-image = "ghcr.io/mayeut/manylinux_2_31:2025.08.23-1"
108+
manylinux-riscv64-image = "ghcr.io/mayeut/manylinux_2_31:2025.11.22-1"
109109
musllinux-x86_64-image = "musllinux_1_2"
110110
musllinux-i686-image = "musllinux_1_2"
111111
musllinux-aarch64-image = "musllinux_1_2"
@@ -129,6 +129,7 @@ environment-pass = ["RUNNER_ARCH"]
129129
inherit.config-settings = "prepend"
130130
config-settings."cmake.define.OPENSSL_ROOT_DIR" = "/usr/local/ssl"
131131
config-settings."cmake.define.OPENSSL_USE_STATIC_LIBS" = "ON"
132+
config-settings."cmake.define.CMAKE_LINKER_TYPE" = "LLD"
132133
config-settings."cmake.define.CMAKE_JOB_POOL_COMPILE" = "compile"
133134
config-settings."cmake.define.CMAKE_JOB_POOL_LINK" = "link"
134135
config-settings."cmake.define.CMAKE_JOB_POOLS" = "compile=4;link=1"

scripts/install-static-clang.sh

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ case "${STATIC_CLANG_ARCH}" in
2020
s390x) GO_ARCH=s390x;;
2121
*) echo "No static-clang toolchain for ${CLANG_ARCH}">2; exit 1;;
2222
esac
23-
STATIC_CLANG_VERSION=21.1.5.0
23+
STATIC_CLANG_VERSION=21.1.6.0
2424
STATIC_CLANG_FILENAME="static-clang-linux-${GO_ARCH}.tar.xz"
2525
STATIC_CLANG_URL="https://github.com/mayeut/static-clang-images/releases/download/v${STATIC_CLANG_VERSION}/${STATIC_CLANG_FILENAME}"
2626
pushd /tmp
2727
cat<<'EOF' | grep "${STATIC_CLANG_FILENAME}" > "${STATIC_CLANG_FILENAME}.sha256"
28-
7af47b1c41dd1e76e08d33f13f7fe33eb43849040f69499516f3f01708b12ae0 static-clang-linux-386.tar.xz
29-
395463d070de084f249bf08d3a8a88a42f19bce24cad37b45c78d48a62a73bdc static-clang-linux-amd64.tar.xz
30-
294839579cf4d2fb5343b6ee1e1613f126c765664e253f2109725d5f49db6aa3 static-clang-linux-arm.tar.xz
31-
7476d44530b560c5bdc1b085c8651810c2fece201410d831c47b2d3b8101c1b2 static-clang-linux-arm64.tar.xz
32-
dcdb642827b5da8570b312c1a877bdf4a2b0f7e3004394a3b216134c3178f346 static-clang-linux-loong64.tar.xz
33-
6b247ae1ce6d095375cd4f37a0484f0c91f8457e3c3f3bb7f9c125a414b19bed static-clang-linux-ppc64le.tar.xz
34-
fb0cce0e1fecceb6d3eb2e095297731107c0803605815b37a5cbcec270700088 static-clang-linux-riscv64.tar.xz
35-
18cbfc7471a40a091b02b2999303dfa3f87368dd01e65d0d3ca7b216826ac84f static-clang-linux-s390x.tar.xz
28+
3f92a131d27ca606dae8230550236a0c897a7f5990d61a293814e0abea8d0e1f static-clang-linux-386.tar.xz
29+
3fc6a3500cb9514b2c3af6d4a95676842769c301f872b6cea8c15576a64e756c static-clang-linux-amd64.tar.xz
30+
82ea0c148ec75f72a2f6f61cc877561efe9675c6e59a1a2c4d130f088f9dc868 static-clang-linux-arm.tar.xz
31+
9b5ad28877b6d56aff530164f7f88590e5d3441a1fddd7a73370539783056120 static-clang-linux-arm64.tar.xz
32+
2adccbcad99d033222c8a63872739919375a7aef2339ce2e8ab7dcfc938502b1 static-clang-linux-loong64.tar.xz
33+
5f551911ad73ecbbcf278e6d05a04bc68bd0dc4918a6a145352072f7734959c6 static-clang-linux-ppc64le.tar.xz
34+
90f5beda1004bec124607df1f9fc0a70c2b9f382b82ab1db2703ebd131c920ef static-clang-linux-riscv64.tar.xz
35+
e4047765a5e64bace4be36f6aae4d859e96bc1298d3ff5ba6b7d6100ea7d23f7 static-clang-linux-s390x.tar.xz
3636
EOF
3737
curl -fsSLO "${STATIC_CLANG_URL}"
3838
sha256sum -c "${STATIC_CLANG_FILENAME}.sha256"
@@ -57,24 +57,11 @@ case "${AUDITWHEEL_POLICY}-${AUDITWHEEL_ARCH}" in
5757
esac
5858
GCC_TRIPLE=$(gcc -dumpmachine)
5959

60-
if [ "${AUDITWHEEL_ARCH}" == "riscv64" ]; then
61-
# the LDFLAGS from pyproject.toml seems not to be taken into account when building CMake (no problem with OpenSSL)
62-
# FAILED: [code=1] Source/kwsys/cmsysTestProcess
63-
# : && /opt/clang/bin/clang -D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 -O3 -DNDEBUG -lstdc++ -lgcc -lrt Source/kwsys/CMakeFiles/cmsysTestProcess.dir/testProcess.c.o -o Source/kwsys/cmsysTestProcess Source/kwsys/libcmsys_c.a && :
64-
# /usr/bin/riscv64-linux-gnu-ld: -march=rv64i2p1_m2p0_a2p1_f2p2_d2p2_c2p0_zicsr2p0_zifencei2p0_zmmul1p0_zaamo1p0_zalrsc1p0: unsupported ISA subset `z'
65-
# /usr/bin/riscv64-linux-gnu-ld: failed to merge target specific data of file Source/kwsys/libcmsys_c.a(ProcessUNIX.c.o)
66-
# /usr/bin/riscv64-linux-gnu-ld: -march=rv64i2p1_m2p0_a2p1_f2p2_d2p2_c2p0_zicsr2p0_zifencei2p0_zmmul1p0_zaamo1p0_zalrsc1p0: unsupported ISA subset `z'
67-
# /usr/bin/riscv64-linux-gnu-ld: failed to merge target specific data of file Source/kwsys/libcmsys_c.a(System.c.o)
68-
# clang: error: linker command failed with exit code 1 (use -v to see invocation)
69-
IMPLICIT_LLD="-fuse-ld=lld"
70-
fi
71-
7260
cat<<EOF >"${TOOLCHAIN_PATH}/bin/${AUDITWHEEL_PLAT}.cfg"
7361
-target ${TARGET_TRIPLE}
7462
${M_ARCH:-}
7563
--gcc-toolchain=${DEVTOOLSET_ROOTPATH:-}/usr
7664
--gcc-triple=${GCC_TRIPLE}
77-
${IMPLICIT_LLD:-}
7865
EOF
7966

8067
cat<<EOF >"${TOOLCHAIN_PATH}/bin/clang.cfg"

0 commit comments

Comments
 (0)