Skip to content

fix(build): use zig archive tools for cross builds #2014

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
TaylorMutch merged 1 commit into from
Jun 26, 2026
+26 −0
Merged

fix(build): use zig archive tools for cross builds #2014

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
26 changes: 26 additions & 0 deletions tasks/scripts/setup-zig-cc-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,31 @@ EOF
chmod +x "$wrapper_dir/$tool"
done

cat >"$wrapper_dir/ar" <<EOF
#!/usr/bin/env bash
set -euo pipefail

exec "$zig" ar "\$@"
EOF
chmod +x "$wrapper_dir/ar"

cat >"$wrapper_dir/ranlib" <<EOF
#!/usr/bin/env bash
set -euo pipefail

exec "$zig" ranlib "\$@"
EOF
chmod +x "$wrapper_dir/ranlib"

processor=${cargo_target%%-*}
toolchain_file="$wrapper_dir/toolchain.cmake"
cat >"$toolchain_file" <<EOF
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR "$processor")
set(CMAKE_C_COMPILER "$wrapper_dir/cc")
set(CMAKE_CXX_COMPILER "$wrapper_dir/c++")
set(CMAKE_AR "$wrapper_dir/ar")
set(CMAKE_RANLIB "$wrapper_dir/ranlib")
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
EOF

Expand Down Expand Up @@ -103,20 +121,28 @@ if [[ -n ${GITHUB_ENV:-} ]]; then
{
echo "CC_${target_env}=$wrapper_dir/cc"
echo "CXX_${target_env}=$wrapper_dir/c++"
echo "AR_${target_env}=$wrapper_dir/ar"
echo "RANLIB_${target_env}=$wrapper_dir/ranlib"
echo "CMAKE_TOOLCHAIN_FILE_${target_env}=$toolchain_file"
if [[ $bare_target_env != "$target_env" ]]; then
echo "CC_${bare_target_env}=$wrapper_dir/cc"
echo "CXX_${bare_target_env}=$wrapper_dir/c++"
echo "AR_${bare_target_env}=$wrapper_dir/ar"
echo "RANLIB_${bare_target_env}=$wrapper_dir/ranlib"
echo "CMAKE_TOOLCHAIN_FILE_${bare_target_env}=$toolchain_file"
fi
} >>"$GITHUB_ENV"
else
echo "export CC_${target_env}=$wrapper_dir/cc"
echo "export CXX_${target_env}=$wrapper_dir/c++"
echo "export AR_${target_env}=$wrapper_dir/ar"
echo "export RANLIB_${target_env}=$wrapper_dir/ranlib"
echo "export CMAKE_TOOLCHAIN_FILE_${target_env}=$toolchain_file"
if [[ $bare_target_env != "$target_env" ]]; then
echo "export CC_${bare_target_env}=$wrapper_dir/cc"
echo "export CXX_${bare_target_env}=$wrapper_dir/c++"
echo "export AR_${bare_target_env}=$wrapper_dir/ar"
echo "export RANLIB_${bare_target_env}=$wrapper_dir/ranlib"
echo "export CMAKE_TOOLCHAIN_FILE_${bare_target_env}=$toolchain_file"
fi
fi
Loading