github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

virtiofsd: Not use "link-self-contained=yes" on s390x

Browse Source 
The compile option link-self-contained=yes asks rustc to use
C library startup object files that come with the compiler,
which are not available on the target s390x-unknown-linux-gnu.
A build does not contain any startup files leading to a
broken executable entry point (causing segmentation fault).

Fixes: #5522

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2022-10-26 23:43:22 +02:00
parent 37f0cd1c8f
commit 43fcb8fd09
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/static-build/virtiofsd/build-static-virtiofsd.sh
View File

@ -47,6 +47,7 @@ pull_virtiofsd_released_binary() {
init_env() { init_env() {
source "$HOME/.cargo/env" source "$HOME/.cargo/env"
extra_rust_flags=" -C link-self-contained=yes"
case ${ARCH} in case ${ARCH} in
"aarch64") "aarch64")
LIBC="musl" LIBC="musl"
@ -60,6 +61,7 @@ init_env() {
"s390x") "s390x")
LIBC="gnu" LIBC="gnu"
ARCH_LIBC=${ARCH}-linux-${LIBC} ARCH_LIBC=${ARCH}-linux-${LIBC}
extra_rust_flags=""
;; ;;
"x86_64") "x86_64")
LIBC="musl" LIBC="musl"
@ -76,7 +78,7 @@ build_virtiofsd_from_source() {
git clone --depth 1 --branch ${virtiofsd_version} ${virtiofsd_repo} virtiofsd git clone --depth 1 --branch ${virtiofsd_version} ${virtiofsd_repo} virtiofsd
pushd virtiofsd pushd virtiofsd
export RUSTFLAGS='-C target-feature=+crt-static -C link-self-contained=yes' export RUSTFLAGS='-C target-feature=+crt-static'${extra_rust_flags}
export LIBSECCOMP_LINK_TYPE=static export LIBSECCOMP_LINK_TYPE=static
export LIBSECCOMP_LIB_PATH=/usr/lib/${ARCH_LIBC} export LIBSECCOMP_LIB_PATH=/usr/lib/${ARCH_LIBC}
export LIBCAPNG_LINK_TYPE=static export LIBCAPNG_LINK_TYPE=static