mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_library/toolchain_util.sh: Remove old download code for Rust

Browse Source 
The SDK now includes a Rust version with the aarch64 cross-compilation
libraries and the toolchain job doesn't build it anymore. Yet it was
still recompiled because the path had changed.
Remove the adjustment of the download URL and any automatic building
of Rust. Just issue a warning so that any problem can be spotted easily.
This change does not affect the SDK bootstrapping (full or just stage4)
but affects ./build_packages and the toolchains job. For the toolchains
job the crossdev setup is missing anyway and rebuilding wouldn't help
but only downloading, yet since in stage4 there are no binary package
URLs at all, it's best to remove this step and if it is needed later,
the warning will help.
This commit is contained in:
Kai Lüke 2020-07-31 12:25:44 +02:00
parent d8519f4b5c
commit cfdb7b0ab7
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" echo "Installing existing binaries"
$sudo emerge "${emerge_flags[@]}" \ $sudo emerge "${emerge_flags[@]}" \
"cross-${cross_chost}/gdb" "${cross_pkgs[@]}" "cross-${cross_chost}/gdb" "${cross_pkgs[@]}"
if [ "${cross_chost}" = aarch64-cros-linux-gnu ]; then if [ "${cross_chost}" = aarch64-cros-linux-gnu ] && \
# Here we need to take only the binary packages from the toolchain-arm64 builds [ ! -d /usr/lib64/rust-*/rustlib/aarch64-unknown-linux-gnu ] && [ ! -d /usr/lib64/rustlib/aarch64-unknown-linux-gnu ]; then
# because the standard Rust packages don't include the arm64 cross target. # If no aarch64 folder exists, warn about the situation but don't compile Rust here or download it as binary package
FILTERED="$(echo $PORTAGE_BINHOST | tr ' ' '\n' | grep toolchain | sed 's#toolchain/#toolchain-arm64/#g' | xargs echo)" echo "WARNING: No aarch64 cross-compilation Rust libraries found!"
# If no aarch64 folder exists, try to remove any existing Rust packages. echo "In case building fails, make sure the old Rust version is deleted with: sudo emerge -C virtual/rust dev-lang/rust"
[ ! -d /usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu ] && ($sudo emerge -C virtual/rust dev-lang/rust || true) echo "Then install it again with: sudo emerge "${emerge_flags[@]}" virtual/rust"
# Building from source is also ok because the cross-compiler got installed. echo "This will download the binary package or build from source."
$sudo PORTAGE_BINHOST="$FILTERED" emerge "${emerge_flags[@]}" virtual/rust
fi fi
fi fi