From 25f9b6e2106a6546a6d4b60500da7a19d7e5ca4b Mon Sep 17 00:00:00 2001 From: Mike Zeller Date: Thu, 28 Dec 2023 20:16:19 +0000 Subject: [PATCH] Make sure the oxide library runpath is passed through to tests --- .github/buildomat/build-and-test.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/buildomat/build-and-test.sh b/.github/buildomat/build-and-test.sh index 34f81bab68..30d98df934 100755 --- a/.github/buildomat/build-and-test.sh +++ b/.github/buildomat/build-and-test.sh @@ -4,6 +4,8 @@ set -o errexit set -o pipefail set -o xtrace +target_os=$1 + # NOTE: This version should be in sync with the recommended version in # .config/nextest.toml. (Maybe build an automated way to pull the recommended # version in the future.) @@ -48,6 +50,13 @@ ptime -m bash ./tools/install_builder_prerequisites.sh -y # banner build export RUSTFLAGS="-D warnings" +# When running on illumos we need to pass an additional runpath that is +# usually configured via ".cargo/config" but the `RUSTFLAGS` env variable +# takes precedence. This path contains oxide specific libraries such as +# libipcc. +if [[ $target_os == "illumos" ]]; then + RUSTFLAGS="-D warnings,-R/usr/platform/oxide/lib/amd64" +fi export RUSTDOCFLAGS="-D warnings" export TMPDIR=$TEST_TMPDIR export RUST_BACKTRACE=1