From 571da528888ec09decada6904d41a5a3108d9ac2 Mon Sep 17 00:00:00 2001 From: Florian Briand Date: Sat, 6 Jul 2024 18:43:09 +0200 Subject: [PATCH] fix: handle PATH the right way and fix .build.env example for windows --- .env.build.win.example | 2 +- build.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.env.build.win.example b/.env.build.win.example index ab064bd..872ef1a 100644 --- a/.env.build.win.example +++ b/.env.build.win.example @@ -1,3 +1,3 @@ SESAM_FSV_VERSION=1.40.13 -SESAM_FSV_LIB_PATH=C:/Program Files/santesocial/fsv/${SESAM_FSV_VERSION}/lib +SESAM_FSV_LIB_PATH="C:/Program Files/santesocial/fsv/${SESAM_FSV_VERSION}/lib" SESAM_FSV_SSVLIB=ssvw64 diff --git a/build.rs b/build.rs index 9068903..06f9b28 100644 --- a/build.rs +++ b/build.rs @@ -5,6 +5,7 @@ use std::path::PathBuf; fn main() { dotenv::from_filename(".env.build").ok(); + println!("cargo::rerun-if-changed=.env.build"); let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); @@ -17,10 +18,8 @@ fn main() { println!("cargo::rustc-link-lib=dylib={}", env::var("SESAM_FSV_SSVLIB").unwrap()); if cfg!(target_os = "windows") { - // Get PATH value let path = env::var("PATH").unwrap_or(String::new()); - println!("PATH={}", path); - println!("cargo:rustc-env=PATH={}", fsv_lib_path.display()); + println!("cargo:rustc-env=PATH={};{}", fsv_lib_path.display(), path); } else if cfg!(target_os = "linux") { println!("cargo:rustc-env=LD_LIBRARY_PATH={}", fsv_lib_path.display()); }