Manually set library paths in .github/driver.sh

This commit is contained in:
Alex Macleod 2024-05-16 21:11:58 +01:00
parent caad063933
commit 821dc871af
3 changed files with 15 additions and 14 deletions

19
.github/driver.sh vendored
View File

@ -2,15 +2,18 @@
set -ex set -ex
# Check sysroot handling sysroot="$(rustc --print sysroot)"
sysroot=$(./target/debug/clippy-driver --print sysroot) case $OS in
test "$sysroot" = "$(rustc --print sysroot)" Linux) export LD_LIBRARY_PATH="$sysroot/lib" ;;
macOS) export DYLD_FALLBACK_LIBRARY_PATH="$sysroot/lib" ;;
Windows) export PATH="$(cygpath "$sysroot")/bin:$PATH" ;;
*) exit 1
esac
if [[ ${OS} == "Windows" ]]; then # Check sysroot handling
desired_sysroot=C:/tmp test "$(./target/debug/clippy-driver --print sysroot)" = "$sysroot"
else
desired_sysroot=/tmp desired_sysroot="target/sysroot"
fi
# Set --sysroot in command line # Set --sysroot in command line
sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot) sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
test "$sysroot" = $desired_sysroot test "$sysroot" = $desired_sysroot

View File

@ -69,6 +69,6 @@ jobs:
working-directory: clippy_dev working-directory: clippy_dev
- name: Test clippy-driver - name: Test clippy-driver
run: | run: .github/driver.sh
TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ') env:
rustup run $TOOLCHAIN bash .github/driver.sh OS: ${{ runner.os }}

View File

@ -116,9 +116,7 @@ jobs:
working-directory: clippy_dev working-directory: clippy_dev
- name: Test clippy-driver - name: Test clippy-driver
run: | run: .github/driver.sh
TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
rustup run $TOOLCHAIN bash .github/driver.sh
env: env:
OS: ${{ runner.os }} OS: ${{ runner.os }}