From a5a5ee93307b440f6ba57cccad51c37e411b1560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Hlusi=C4=8Dka?= Date: Wed, 21 Jan 2026 00:48:17 +0100 Subject: [PATCH] Fix `password-hash/build.rs` which would cause rust-analyzer to crash --- firmware2/password-hash/build.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/firmware2/password-hash/build.rs b/firmware2/password-hash/build.rs index c279522..652b9d6 100644 --- a/firmware2/password-hash/build.rs +++ b/firmware2/password-hash/build.rs @@ -16,15 +16,19 @@ fn main() { .display() ); - let libsodium_install_dir = PathBuf::from(env::var("LIBSODIUM_INSTALL_DIR").unwrap()); - println!( - "cargo:rustc-link-search=native={}", - libsodium_install_dir.join("lib").display() - ); - println!("cargo:rustc-link-lib=static=sodium"); - println!( - "cargo:rerun-if-changed={}", - libsodium_install_dir.join("lib/libsodium.a").display() - ); + if let Ok(libsodium_install_dir) = env::var("LIBSODIUM_INSTALL_DIR") { + let libsodium_install_dir = PathBuf::from(libsodium_install_dir); + println!( + "cargo:rustc-link-search=native={}", + libsodium_install_dir.join("lib").display() + ); + println!("cargo:rustc-link-lib=static=sodium"); + println!( + "cargo:rerun-if-changed={}", + libsodium_install_dir.join("lib/libsodium.a").display() + ); + } else { + println!("cargo:warn=Environment variable `LIBSODIUM_INSTALL_DIR` missing!"); + } } }