mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-04-20 04:51:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from flatcar-linux/scripts

Browse Source 
build_library/toolchain_util.sh: Remove old download code for Rust by pothos
This commit is contained in:
Kai Lüke 2020-08-03 11:29:10 +02:00
commit a78093e8f6
No known key found for this signature in database
GPG Key ID: E5601DA3A1D902A8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build_library/toolchain_util.sh
View File

@ -332,14 +332,13 @@ install_cross_toolchain() {
echo "Installing existing binaries"
$sudo emerge "${emerge_flags[@]}" \
"cross-${cross_chost}/gdb" "${cross_pkgs[@]}"
if [ "${cross_chost}" = aarch64-cros-linux-gnu ]; then
# Here we need to take only the binary packages from the toolchain-arm64 builds
# because the standard Rust packages don't include the arm64 cross target.
FILTERED="$(echo $PORTAGE_BINHOST | tr ' ' '\n' | grep toolchain | sed 's#toolchain/#toolchain-arm64/#g' | xargs echo)"
# If no aarch64 folder exists, try to remove any existing Rust packages.
[ ! -d /usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu ] && ($sudo emerge -C virtual/rust dev-lang/rust || true)
# Building from source is also ok because the cross-compiler got installed.
$sudo PORTAGE_BINHOST="$FILTERED" emerge "${emerge_flags[@]}" virtual/rust
if [ "${cross_chost}" = aarch64-cros-linux-gnu ] && \
[ ! -d /usr/lib64/rust-*/rustlib/aarch64-unknown-linux-gnu ] && [ ! -d /usr/lib64/rustlib/aarch64-unknown-linux-gnu ]; then
# If no aarch64 folder exists, warn about the situation but don't compile Rust here or download it as binary package
echo "WARNING: No aarch64 cross-compilation Rust libraries found!"
echo "In case building fails, make sure the old Rust version is deleted with: sudo emerge -C virtual/rust dev-lang/rust"
echo "Then install it again with: sudo emerge "${emerge_flags[@]}" virtual/rust"
echo "This will download the binary package or build from source."
fi
fi