From cf279d4affe24d3384395a6b7bcc0bed38b9d700 Mon Sep 17 00:00:00 2001 From: Novus Nota <68142933+novusnota@users.noreply.github.com> Date: Sun, 22 Mar 2026 17:01:07 +0100 Subject: [PATCH] chore: update llvm-ar and llvm-objcopy commands to version 16 On some machines, `llvm-ar` does not exist even after running the llvm/clang installation script. It can be fixed with `update-alternatives` on Ubuntu or a symbolic link, but since we demand both LLVM and Clang to be of version 16, let's just explicitly require the proper `llvm-ar-16` binary and be done with it. Plus, let's not use absolute system paths and instead invoke `llvm-objcopy-16` directly. --- assembly/native/build-ubuntu-static.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assembly/native/build-ubuntu-static.sh b/assembly/native/build-ubuntu-static.sh index a9efaf0b45..1df5f783cd 100644 --- a/assembly/native/build-ubuntu-static.sh +++ b/assembly/native/build-ubuntu-static.sh @@ -81,7 +81,7 @@ create_bundled_archive() { if [ -n "$zlib_static_lib" ]; then echo "addlib $zlib_static_lib"; fi echo "save" echo "end" - } | llvm-ar -M + } | llvm-ar-16 -M ranlib "$output" } @@ -117,7 +117,7 @@ mapfile -t tolk_deps < <(query_static_link_archives crypto/fift) create_bundled_archive libemulator.a "${emulator_deps[@]}" rm -f libtolk.a libtolkfiftlib-renamed.a -/usr/lib/llvm-16/bin/llvm-objcopy \ +llvm-objcopy-16 \ tolk/libtolkfiftlib.a \ libtolkfiftlib-renamed.a create_bundled_archive libtolk.a libtolkfiftlib-renamed.a "${tolk_deps[@]}"