Skip to content

Commit 0893046

Browse files
committed
refactor setting C SDK path code
1 parent f404f5e commit 0893046

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

ledger_secure_sdk_sys/build.rs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,11 @@ impl SDKBuilder<'_> {
187187
{
188188
"nanosplus" => Device {
189189
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+
{
191193
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),
196195
},
197196
target: "thumbv8m.main-none-eabi",
198197
defines: {
@@ -216,12 +215,11 @@ impl SDKBuilder<'_> {
216215
},
217216
"nanox" => Device {
218217
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+
{
220221
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),
225223
},
226224
target: "thumbv6m-none-eabi",
227225
defines: {
@@ -245,12 +243,11 @@ impl SDKBuilder<'_> {
245243
},
246244
"stax" => Device {
247245
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+
{
249249
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),
254251
},
255252
target: "thumbv8m.main-none-eabi",
256253
defines: header2define("csdk_stax.h"),
@@ -261,12 +258,11 @@ impl SDKBuilder<'_> {
261258
},
262259
"flex" => Device {
263260
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+
{
265264
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),
270266
},
271267
target: "thumbv8m.main-none-eabi",
272268
defines: header2define("csdk_flex.h"),

0 commit comments

Comments
 (0)