mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-08-20 15:01:16 +00:00
scripts: Only use musl for the Rust components
Don't use the musl toolchain for the virtiofsd build as it does not work. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
176d671609
commit
dc034eb3b0
@ -310,9 +310,7 @@ cmd_tests() {
|
|||||||
--volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
|
--volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
|
||||||
--volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
|
--volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
|
||||||
--env USER="root" \
|
--env USER="root" \
|
||||||
--env BUILD_TARGET="$target" \
|
--env CH_LIBC="${libc}" \
|
||||||
--env CFLAGS="$cflags" \
|
|
||||||
--env TARGET_CC="$target_cc" \
|
|
||||||
"$CTR_IMAGE" \
|
"$CTR_IMAGE" \
|
||||||
./scripts/run_integration_tests.sh "$@" || fix_dir_perms $? || exit $?
|
./scripts/run_integration_tests.sh "$@" || fix_dir_perms $? || exit $?
|
||||||
fi
|
fi
|
||||||
|
@ -210,6 +210,13 @@ sudo ip tuntap add name vunet-tap0 mode tap
|
|||||||
# Create tap interface with multipe queues support for vhost_user_net test.
|
# Create tap interface with multipe queues support for vhost_user_net test.
|
||||||
sudo ip tuntap add name vunet-tap1 mode tap multi_queue
|
sudo ip tuntap add name vunet-tap1 mode tap multi_queue
|
||||||
|
|
||||||
|
BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
|
||||||
|
CFLAGS=""
|
||||||
|
TARGET_CC=""
|
||||||
|
if [[ "$target" == "x86_64-unknown-linux-musl" ]]; then
|
||||||
|
TARGET_CC="musl-gcc"
|
||||||
|
CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
|
||||||
|
fi
|
||||||
|
|
||||||
cargo build --release --target $BUILD_TARGET
|
cargo build --release --target $BUILD_TARGET
|
||||||
strip target/$BUILD_TARGET/release/cloud-hypervisor
|
strip target/$BUILD_TARGET/release/cloud-hypervisor
|
||||||
|
Loading…
Reference in New Issue
Block a user