diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml index 62865f04..a0c2e6ab 100644 --- a/ledger_device_sdk/Cargo.toml +++ b/ledger_device_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ledger_device_sdk" -version = "1.27.1" +version = "1.27.2" authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"] edition = "2021" license.workspace = true @@ -20,7 +20,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.11.3" } +ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.11.4" } [features] debug = [] @@ -33,5 +33,5 @@ io_new = [] # switch to new 'io' module default = [ "heap" ] [lints.rust.unexpected_cfgs] -level = "warn" +level = "warn" check-cfg = ['cfg(target_os, values("apex_p", "stax", "flex", "nanox", "nanosplus"))'] diff --git a/ledger_secure_sdk_sys/Cargo.toml b/ledger_secure_sdk_sys/Cargo.toml index 54adc101..f7234b2c 100644 --- 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.11.3" +version = "1.11.4" authors = ["yhql", "agrojean-ledger", "yogh333"] edition = "2021" license.workspace = true diff --git a/ledger_secure_sdk_sys/build.rs b/ledger_secure_sdk_sys/build.rs index 5fb51b56..c1c30743 100644 --- a/ledger_secure_sdk_sys/build.rs +++ b/ledger_secure_sdk_sys/build.rs @@ -42,7 +42,6 @@ struct Device<'a> { pub defines: Vec<(String, Option)>, pub cflags: Vec, pub glyphs_folders: Vec, - pub arm_libs: String, pub linker_script: String, } @@ -174,7 +173,6 @@ impl SDKBuilder<'_> { .collect::>() }, glyphs_folders: Vec::new(), - arm_libs: Default::default(), linker_script: format!( "{}/devices/nanosplus/nanosplus_layout.ld", env!("CARGO_MANIFEST_DIR") @@ -222,7 +220,6 @@ impl SDKBuilder<'_> { .collect::>() }, glyphs_folders: Vec::new(), - arm_libs: Default::default(), linker_script: format!( "{}/devices/nanox/nanox_layout.ld", env!("CARGO_MANIFEST_DIR") @@ -256,7 +253,6 @@ impl SDKBuilder<'_> { .collect::>() }, glyphs_folders: Vec::new(), - arm_libs: Default::default(), linker_script: format!( "{}/devices/stax/stax_layout.ld", env!("CARGO_MANIFEST_DIR") @@ -290,7 +286,6 @@ impl SDKBuilder<'_> { .collect::>() }, glyphs_folders: Vec::new(), - arm_libs: Default::default(), linker_script: format!( "{}/devices/flex/flex_layout.ld", env!("CARGO_MANIFEST_DIR") @@ -324,7 +319,6 @@ impl SDKBuilder<'_> { .collect::>() }, glyphs_folders: Vec::new(), - arm_libs: Default::default(), linker_script: format!( "{}/devices/apex_p/apex_p_layout.ld", env!("CARGO_MANIFEST_DIR") @@ -383,20 +377,6 @@ impl SDKBuilder<'_> { } } - // Set ARM pre-compiled libraries path - self.device.arm_libs = match self.device.name { - DeviceName::NanoX => { - let mut path = self.device.c_sdk.display().to_string(); - path.push_str("/arch/st33/lib"); - path - } - DeviceName::NanoSPlus | DeviceName::Flex | DeviceName::Stax | DeviceName::ApexP => { - let mut path = self.device.c_sdk.display().to_string(); - path.push_str("/arch/st33k1/lib"); - path - } - }; - // export TARGET into env for 'infos.rs' println!("cargo:rustc-env=TARGET={}", self.device.name); println!("cargo:warning=Device is {:?}", self.device.name); @@ -557,13 +537,6 @@ impl SDKBuilder<'_> { /* Compile the SDK */ command.compile("ledger-secure-sdk"); - /* Link with libc, libm and libgcc */ - 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"); - - println!("cargo:rustc-link-search={path}"); Ok(()) } diff --git a/ledger_secure_sdk_sys/link.ld b/ledger_secure_sdk_sys/link.ld index 5736654c..dd939687 100644 --- a/ledger_secure_sdk_sys/link.ld +++ b/ledger_secure_sdk_sys/link.ld @@ -123,9 +123,6 @@ SECTIONS /DISCARD/ : { - libc.a ( * ) - libm.a ( * ) - libgcc.a ( * ) *(.ARM.exidx* .gnu.linkonce.armexidx.*) *(.debug_info) }