Fix X11 and rust build on arm64

This commit is contained in:
BtbN 2022-07-06 14:55:26 +02:00
parent f29d3b5662
commit 9c766b0b33
16 changed files with 64 additions and 24 deletions

View file

@ -25,11 +25,7 @@ ffbuild_dockerbuild() {
)
fi
# For some reason, RUSTFLAGS, CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER,
# and .cargo/config.toml can't work, so have to put a symbolic link
if [[ $TARGET == linuxarm64 ]]; then
ln -s /opt/ct-ng/bin/aarch64-ffbuild-linux-gnu-gcc /opt/ct-ng/bin/aarch64-linux-gnu-gcc
fi
export CC="${FFBUILD_CROSS_PREFIX}gcc"
cargo cinstall "${myconf[@]}"
}