Merge pull request #240 from LedgerHQ/y333/link_with_proper_libc

Use libc from C SDK for each device

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.20.2"
+version = "1.20.3"
 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.5" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.6.6" }
 
 [features]
 debug = []

ledger_device_sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_secure_sdk_sys"
-version = "1.6.5"
+version = "1.6.6"
 authors = ["yhql", "agrojean-ledger", "yogh333"]
 edition = "2021"
 license.workspace = true

ledger_secure_sdk_sys/Cargo.toml

@@ -518,9 +518,21 @@ impl SDKBuilder {
         command.compile("ledger-secure-sdk");
 
         /* Link with libc for unresolved symbols */
-        let gcc_tc = self.gcc_toolchain.display().to_string();
+        let mut path = self.bolos_sdk.display().to_string();
+        match self.device {
+            Device::NanoS => {
+                path = self.gcc_toolchain.display().to_string();
+                path.push_str("/lib");
+            }
+            Device::NanoX => {
+                path.push_str("/arch/st33/lib");
+            }
+            Device::NanoSPlus | Device::Flex | Device::Stax => {
+                path.push_str("/arch/st33k1/lib");
+            }
+        };
         println!("cargo:rustc-link-lib=c");
-        println!("cargo:rustc-link-search={gcc_tc}/lib");
+        println!("cargo:rustc-link-search={path}");
     }
 
     fn generate_bindings(&self) {