From de05a823a339876728991a6d436e5b8c1bb45d6b Mon Sep 17 00:00:00 2001
From: Julien Cretin <cretin@google.com>
Date: Thu, 30 May 2024 11:32:31 +0200
Subject: [PATCH] Do not strip debuginfo in debug build

This seems to have changed in https://github.com/rust-lang/cargo/pull/13257.

Also do not install libusb-1.0 during setup. This doesn't seem necessary anymore.
---
 crates/xtask/src/main.rs | 1 +
 scripts/setup.sh         | 1 -
 scripts/system.sh        | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/xtask/src/main.rs b/crates/xtask/src/main.rs
index 105aebc4d..b235c5657 100644
--- a/crates/xtask/src/main.rs
+++ b/crates/xtask/src/main.rs
@@ -419,6 +419,7 @@ impl RunnerOptions {
             } else {
                 rustflags.push("-C link-arg=-Tdefmt.x".to_string());
                 rustflags.push("-C debuginfo=2".to_string());
+                rustflags.push("-C strip=none".to_string());
             }
         }
         if let Some(level) = self.opt_level {
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 003d97d2c..63e80607a 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -56,7 +56,6 @@ fi
 # Transitive dependencies of xtask.
 ensure bin cc
 ensure lib libudev
-ensure lib libusb-1.0
 
 # Transitive dependencies of runner-host. This should ideally be installed on
 # demand by xtask.
diff --git a/scripts/system.sh b/scripts/system.sh
index b26e581a4..5ddd84f91 100644
--- a/scripts/system.sh
+++ b/scripts/system.sh
@@ -49,7 +49,6 @@ install() {
       lib)
         case "$2" in
           libudev) set libudev-dev ;;
-          libusb-1.0) set libusb-1.0-0-dev ;;
           openssl) set libssl-dev ;;
           *) e "Internal error: apt-get install unimplemented for $*" ;;
         esac ;;