From b93573997167954aa07579e56e747bae6f2dd82a Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 21 Nov 2024 17:15:04 -0800 Subject: [PATCH] remove autogenerated cargo config before installing tools --- tutorials/gn/gn.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tutorials/gn/gn.toml b/tutorials/gn/gn.toml index 839428b4efe..efedd1f75fd 100644 --- a/tutorials/gn/gn.toml +++ b/tutorials/gn/gn.toml @@ -20,6 +20,8 @@ exit_on_error true mkdir tutorials/gn/third_party_tools cd tutorials/gn/third_party_tools + + # depot_tools contains the following things we need: # 1. A cross-platform ninja wrapper script # 2. cipd, a tool to download a prebuilt GN binary @@ -46,6 +48,10 @@ else exec --fail-on-error ln -s Cargo.toml.crates-io fuchsia/tools/cargo-gnaw/Cargo.toml end +# Unfortunately this (autogenerated, not-checked-in) file needs to be removed for the next install to work correctly. +# There is currently no way to override cargo config inheritance. +rm ../.cargo/config + # Install GNaw locally in the bin directory (alongside GN) exec --fail-on-error cargo install --path fuchsia/tools/cargo-gnaw --root .