Merge pull request #238 from LedgerHQ/fix/apa/sysroot_fallback

Fix sysroot fallback
LedgerHQ · Feb 4, 2025 · 1b289c6 · 1b289c6
2 parents b790f1f + 0196fab
commit 1b289c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.20.1"
+version = "1.20.2"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -21,7 +21,7 @@ rand_core = { version = "0.6.3", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }
 numtoa = "0.2.4"
 const-zero = "0.1.1"
-ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.6.4" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.6.5" }
 
 [features]
 debug = []

diff --git a/ledger_secure_sdk_sys/Cargo.toml b/ledger_secure_sdk_sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_secure_sdk_sys"
-version = "1.6.4"
+version = "1.6.5"
 authors = ["yhql", "agrojean-ledger", "yogh333"]
 edition = "2021"
 license.workspace = true
@@ -22,4 +22,4 @@ ccid = []
 
 [lints.rust.unexpected_cfgs]
 level = "warn"
-check-cfg = ['cfg(target_os, values("stax", "flex", "nanos", "nanox", "nanosplus"))']
+check-cfg = ['cfg(target_os, values("stax", "flex", "nanos", "nanox", "nanosplus"))']
diff --git a/ledger_secure_sdk_sys/build.rs b/ledger_secure_sdk_sys/build.rs
@@ -319,7 +319,8 @@ impl SDKBuilder {
             .trim();
 
         let gcc_toolchain = if sysroot.is_empty() {
-            String::from("/usr")
+            // path for Debian-based systems
+            String::from("/usr/lib/arm-none-eabi")
         } else {
             format!("{sysroot}")
         };