yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: mk/check-symbol-prefixes.sh: Use llvm-tools-preview llvm-nm.

Browse Source
This commit is contained in:
Brian Smith 2023-12-19 10:00:22 -08:00
parent a94849dc26
commit 183ce8066b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View File

@ -290,10 +290,16 @@ jobs:
# Unknown attribute kind (528)
# (Producer: 'LLVM12.0.0-rust-1.54.0-nightly'
# Reader: 'LLVM APPLE_1_1200.0.32.29_0')
- if: ${{ matrix.target != 'aarch64-apple-ios' &&
!contains(matrix.host_os, 'windows') &&
(!contains(matrix.host_os, 'macos') || matrix.mode != '--release') }}
run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
- if: ${{ matrix.target != 'aarch64-apple-ios' &&
!contains(matrix.host_os, 'windows') &&
(!contains(matrix.host_os, 'macos') || matrix.mode != '--release') }}
run: mk/check-symbol-prefixes.sh --target=${{ matrix.target }}
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
test-bench:
# Don't run duplicate `push` jobs for the repo owner's PRs.
@ -419,11 +425,16 @@ jobs:
# Unknown attribute kind (528)
# (Producer: 'LLVM12.0.0-rust-1.54.0-nightly'
# Reader: 'LLVM APPLE_1_1200.0.32.29_0')
- if: ${{ matrix.target != 'aarch64-apple-ios' &&
!contains(matrix.host_os, 'windows') &&
(!contains(matrix.host_os, 'macos') || matrix.mode != '--release') }}
run: mk/check-symbol-prefixes.sh --target=${{ matrix.target }}
run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
- if: ${{ matrix.target != 'aarch64-apple-ios' &&
!contains(matrix.host_os, 'windows') &&
(!contains(matrix.host_os, 'macos') || matrix.mode != '--release') }}
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
# The wasm32-unknown-unknown targets have a different set of feature sets and
# an additional `webdriver` dimension.
@ -477,7 +488,8 @@ jobs:
# Check that all the needed symbol renaming was done.
# TODO: Do this check on Windows too.
- run: mk/check-symbol-prefixes.sh --target=${{ matrix.target }}
- run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
- run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
coverage:
# Don't run duplicate `push` jobs for the repo owner's PRs.

14
mk/check-symbol-prefixes.sh
View File

@ -22,20 +22,16 @@ for arg in $*; do
--target=*)
target=${arg#*=}
;;
+*)
toolchain=${arg#*+}
;;
*)
;;
esac
done
case "$OSTYPE" in
darwin*)
nm_exe=nm
;;
*)
llvm_version=16
nm_exe=llvm-nm-$llvm_version
;;
esac
# Use the host target-libdir, not the target target-libdir.
nm_exe=$(rustc +${toolchain} --print target-libdir)/../bin/llvm-nm
# TODO: This should only look in one target directory.
# TODO: This isn't as strict as it should be.