From def3699a965bb107a2cfc23504110144dd95ed4e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 10 Jun 2020 17:44:50 +0200 Subject: [PATCH] build_library: deal with both virtual/rust and dev-lang/rust Toolchain utils have installed only `dev-lang/rust`. It could result in version mismatch between `virtual/rust` and `dev-lang/rust`, because `dev-lang/rust` does not automatically pull in `virtual/rust`. So install `virtual/rust` instead of `dev-lang/rust`. --- build_library/toolchain_util.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 6ba1015375..0e8889cace 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -337,9 +337,9 @@ install_cross_toolchain() { # 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 dev-lang/rust || true) + [ ! -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[@]}" dev-lang/rust + $sudo PORTAGE_BINHOST="$FILTERED" emerge "${emerge_flags[@]}" virtual/rust fi fi