mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-10 07:04:18 +00:00
Manually set library paths in .github/driver.sh
This commit is contained in:
parent
caad063933
commit
821dc871af
3 changed files with 15 additions and 14 deletions
19
.github/driver.sh
vendored
19
.github/driver.sh
vendored
|
@ -2,15 +2,18 @@
|
|||
|
||||
set -ex
|
||||
|
||||
# Check sysroot handling
|
||||
sysroot=$(./target/debug/clippy-driver --print sysroot)
|
||||
test "$sysroot" = "$(rustc --print sysroot)"
|
||||
sysroot="$(rustc --print sysroot)"
|
||||
case $OS in
|
||||
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
|
||||
desired_sysroot=C:/tmp
|
||||
else
|
||||
desired_sysroot=/tmp
|
||||
fi
|
||||
# Check sysroot handling
|
||||
test "$(./target/debug/clippy-driver --print sysroot)" = "$sysroot"
|
||||
|
||||
desired_sysroot="target/sysroot"
|
||||
# Set --sysroot in command line
|
||||
sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
|
||||
test "$sysroot" = $desired_sysroot
|
||||
|
|
6
.github/workflows/clippy.yml
vendored
6
.github/workflows/clippy.yml
vendored
|
@ -69,6 +69,6 @@ jobs:
|
|||
working-directory: clippy_dev
|
||||
|
||||
- name: Test clippy-driver
|
||||
run: |
|
||||
TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
|
||||
rustup run $TOOLCHAIN bash .github/driver.sh
|
||||
run: .github/driver.sh
|
||||
env:
|
||||
OS: ${{ runner.os }}
|
||||
|
|
4
.github/workflows/clippy_bors.yml
vendored
4
.github/workflows/clippy_bors.yml
vendored
|
@ -116,9 +116,7 @@ jobs:
|
|||
working-directory: clippy_dev
|
||||
|
||||
- name: Test clippy-driver
|
||||
run: |
|
||||
TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ')
|
||||
rustup run $TOOLCHAIN bash .github/driver.sh
|
||||
run: .github/driver.sh
|
||||
env:
|
||||
OS: ${{ runner.os }}
|
||||
|
||||
|
|
Loading…
Reference in a new issue