mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-09-28 17:45:44 +00:00
scripts: Fix feature build for aarch64 and mshv builds
These were erroneously skipping features for the unit tests and the "build" target for dev_cli.sh Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
6eb47bdb03
commit
fa7487629f
@ -270,8 +270,6 @@ cmd_build() {
|
|||||||
cargo_args=("$@")
|
cargo_args=("$@")
|
||||||
[ $build = "release" ] && cargo_args+=("--release")
|
[ $build = "release" ] && cargo_args+=("--release")
|
||||||
cargo_args+=(--target "$target")
|
cargo_args+=(--target "$target")
|
||||||
[ "$(uname -m)" = "aarch64" ] && cargo_args+=("--no-default-features")
|
|
||||||
[ "$(uname -m)" = "aarch64" ] && cargo_args+=(--features "$hypervisor")
|
|
||||||
|
|
||||||
rustflags=""
|
rustflags=""
|
||||||
target_cc=""
|
target_cc=""
|
||||||
|
@ -8,9 +8,9 @@ process_common_args "$@"
|
|||||||
BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
|
BUILD_TARGET=${BUILD_TARGET-x86_64-unknown-linux-gnu}
|
||||||
cargo_args=("")
|
cargo_args=("")
|
||||||
|
|
||||||
if [[ $(uname -m) = "aarch64" || $hypervisor = "mshv" ]]; then
|
if [[ $hypervisor = "mshv" ]]; then
|
||||||
cargo_args+=("--no-default-features")
|
cargo_args+=("--no-default-features")
|
||||||
cargo_args+=("--features $hypervisor")
|
cargo_args+=("--features common,$hypervisor")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
|
if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
|
||||||
@ -19,4 +19,4 @@ if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
export RUST_BACKTRACE=1
|
export RUST_BACKTRACE=1
|
||||||
cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1;
|
cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user