@@ -187,12 +187,11 @@ impl SDKBuilder<'_> {
187
187
{
188
188
"nanosplus" => Device {
189
189
name : DeviceName :: NanoSPlus ,
190
- c_sdk : match env:: var ( "LEDGER_SDK_PATH" ) {
190
+ c_sdk : match env:: var ( "LEDGER_SDK_PATH" )
191
+ . or_else ( |_| env:: var ( "NANOSP_SDK" ) )
192
+ {
191
193
Ok ( path) => PathBuf :: from ( path) ,
192
- Err ( _) => match env:: var ( "NANOSP_SDK" ) {
193
- Ok ( path) => PathBuf :: from ( path) ,
194
- Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
195
- } ,
194
+ Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
196
195
} ,
197
196
target : "thumbv8m.main-none-eabi" ,
198
197
defines : {
@@ -216,12 +215,11 @@ impl SDKBuilder<'_> {
216
215
} ,
217
216
"nanox" => Device {
218
217
name : DeviceName :: NanoX ,
219
- c_sdk : match env:: var ( "LEDGER_SDK_PATH" ) {
218
+ c_sdk : match env:: var ( "LEDGER_SDK_PATH" )
219
+ . or_else ( |_| env:: var ( "NANOX_SDK" ) )
220
+ {
220
221
Ok ( path) => PathBuf :: from ( path) ,
221
- Err ( _) => match env:: var ( "NANOX_SDK" ) {
222
- Ok ( path) => PathBuf :: from ( path) ,
223
- Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
224
- } ,
222
+ Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
225
223
} ,
226
224
target : "thumbv6m-none-eabi" ,
227
225
defines : {
@@ -245,12 +243,11 @@ impl SDKBuilder<'_> {
245
243
} ,
246
244
"stax" => Device {
247
245
name : DeviceName :: Stax ,
248
- c_sdk : match env:: var ( "LEDGER_SDK_PATH" ) {
246
+ c_sdk : match env:: var ( "LEDGER_SDK_PATH" )
247
+ . or_else ( |_| env:: var ( "STAX_SDK" ) )
248
+ {
249
249
Ok ( path) => PathBuf :: from ( path) ,
250
- Err ( _) => match env:: var ( "STAX_SDK" ) {
251
- Ok ( path) => PathBuf :: from ( path) ,
252
- Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
253
- } ,
250
+ Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
254
251
} ,
255
252
target : "thumbv8m.main-none-eabi" ,
256
253
defines : header2define ( "csdk_stax.h" ) ,
@@ -261,12 +258,11 @@ impl SDKBuilder<'_> {
261
258
} ,
262
259
"flex" => Device {
263
260
name : DeviceName :: Flex ,
264
- c_sdk : match env:: var ( "LEDGER_SDK_PATH" ) {
261
+ c_sdk : match env:: var ( "LEDGER_SDK_PATH" )
262
+ . or_else ( |_| env:: var ( "FLEX_SDK" ) )
263
+ {
265
264
Ok ( path) => PathBuf :: from ( path) ,
266
- Err ( _) => match env:: var ( "FLEX_SDK" ) {
267
- Ok ( path) => PathBuf :: from ( path) ,
268
- Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
269
- } ,
265
+ Err ( _) => return Err ( SDKBuildError :: MissingSDKPath ) ,
270
266
} ,
271
267
target : "thumbv8m.main-none-eabi" ,
272
268
defines : header2define ( "csdk_flex.h" ) ,
0 commit comments