From d62ae988896a267c44a60359d0b4a34ab19eccb0 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Thu, 27 Jul 2023 17:26:50 -0400
Subject: [PATCH] integration-test: Remove RUSTC from cargo-in-cargo

Fixes #686.
---
 test/integration-test/build.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/integration-test/build.rs b/test/integration-test/build.rs
index 4ba74804..cf01869b 100644
--- a/test/integration-test/build.rs
+++ b/test/integration-test/build.rs
@@ -147,8 +147,10 @@ fn main() {
         ]);
 
         // Workaround to make sure that the rust-toolchain.toml is respected.
-        cmd.env_remove("RUSTUP_TOOLCHAIN")
-            .current_dir(integration_ebpf_dir);
+        for key in ["RUSTUP_TOOLCHAIN", "RUSTC"] {
+            cmd.env_remove(key);
+        }
+        cmd.current_dir(integration_ebpf_dir);
 
         // Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself.
         let ebpf_target_dir = out_dir.join("integration-ebpf");