From 8f5978fda24bd5ecba9005af39c6119142510820 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Fri, 29 Oct 2021 17:07:23 -0700 Subject: [PATCH] crosvm: Do not use .cargo/config.toml Building crates in common/ will try to access the file, but won't be allowed to read it with CROS_WORKON_SUBTREE set. BUG=b:195126527 TEST=./tools/run_tests --target=vm:aarch64 Change-Id: Ic455ca6c3102dd363daf70468e5d89003d10bb4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3254042 Reviewed-by: Dmitry Torokhov Reviewed-by: Abhishek Bhardwaj Tested-by: Dennis Kempin --- .cargo/config.toml | 2 -- tools/impl/test_target.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 3c32d251c5..0000000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.aarch64-unknown-linux-gnu] -linker = "aarch64-linux-gnu-gcc" diff --git a/tools/impl/test_target.py b/tools/impl/test_target.py index feaebe2fcb..a2921cf485 100755 --- a/tools/impl/test_target.py +++ b/tools/impl/test_target.py @@ -50,6 +50,7 @@ Arch = Literal["x86_64", "aarch64", "armhf"] BUILD_ENV = { "PKG_CONFIG_aarch64_unknown_linux_gnu": "aarch64-linux-gnu-pkg-config", "PKG_CONFIG_armv7_unknown_linux_gnueabihf": "arm-linux-gnueabihf-pkg-config", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "aarch64-linux-gnu-gcc", }