@@ -169,7 +169,7 @@ impl SDKBuilder<'_> {
169
169
170
170
let gcc_toolchain = if sysroot. is_empty ( ) {
171
171
// path for Debian-based systems
172
- String :: from ( "/usr/lib/arm-none-eabi" )
172
+ String :: from ( "/usr/lib/picolibc/ arm-none-eabi" )
173
173
} else {
174
174
format ! ( "{sysroot}" )
175
175
} ;
@@ -302,13 +302,13 @@ impl SDKBuilder<'_> {
302
302
// Set ARM pre-compiled libraries path
303
303
self . device . arm_libs = match self . device . name {
304
304
DeviceName :: NanoX => {
305
- let mut path = self . device . c_sdk . display ( ) . to_string ( ) ;
306
- path. push_str ( "/arch/st33/lib " ) ;
305
+ let mut path = self . gcc_toolchain . display ( ) . to_string ( ) ;
306
+ path. push_str ( "/lib/thumb/v7-m/nofp " ) ;
307
307
path
308
308
}
309
309
DeviceName :: NanoSPlus | DeviceName :: Flex | DeviceName :: Stax => {
310
- let mut path = self . device . c_sdk . display ( ) . to_string ( ) ;
311
- path. push_str ( "/arch/st33k1/lib " ) ;
310
+ let mut path = self . gcc_toolchain . display ( ) . to_string ( ) ;
311
+ path. push_str ( "/lib/thumb/v8-m.main/nofp " ) ;
312
312
path
313
313
}
314
314
} ;
@@ -434,11 +434,9 @@ impl SDKBuilder<'_> {
434
434
435
435
command. compile ( "ledger-secure-sdk" ) ;
436
436
437
- /* Link with libc, libm and clang compiler-rt builtins */
437
+ /* Link with libc */
438
438
let path = self . device . arm_libs . clone ( ) ;
439
439
println ! ( "cargo:rustc-link-lib=c" ) ;
440
- println ! ( "cargo:rustc-link-lib=m" ) ;
441
- println ! ( "cargo:rustc-link-lib=clang_rt.builtins" ) ;
442
440
443
441
println ! ( "cargo:rustc-link-search={path}" ) ;
444
442
Ok ( ( ) )
0 commit comments