Merge pull request #243 from LedgerHQ/y333/patch_for_nanos_build

Emergency patch for building Nano S apps

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.21.0"
+version = "1.21.1"
 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.7.0" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.7.1" }
 
 [features]
 debug = []

ledger_device_sdk/Cargo.toml

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

ledger_secure_sdk_sys/Cargo.toml

@@ -204,7 +204,13 @@ impl SDKBuilder<'_> {
                 name: DeviceName::NanoS,
                 c_sdk: Default::default(),
                 target: "thumbv6m-none-eabi",
-                defines: header2define("csdk_nanos.h"),
+                defines: {
+                    let mut v = header2define("csdk_nanos.h");
+                    println!("cargo:warning=BAGL is built");
+                    println!("cargo:rustc-env=C_SDK_GRAPHICS={}", "bagl");
+                    v.push((String::from("HAVE_BAGL"), None));
+                    v
+                },
                 cflags: Vec::from(CFLAGS_NANOS),
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -468,7 +474,9 @@ impl SDKBuilder<'_> {
         let path = self.device.arm_libs.clone();
         println!("cargo:rustc-link-lib=c");
         println!("cargo:rustc-link-lib=m");
-        println!("cargo:rustc-link-lib=gcc");
+        if self.device.name != DeviceName::NanoS {
+            println!("cargo:rustc-link-lib=gcc");
+        }
         println!("cargo:rustc-link-search={path}");
         Ok(())
     }