mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary LD_LIBRARY_PATH parts

Browse Source
This commit is contained in:
bjorn3 2021-06-20 14:40:49 +02:00
parent 62e49c5b61
commit 03c9ecfb30
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/cargo.rs
View File

@ -41,20 +41,6 @@ fn main() {
.stdout;
let default_sysroot = std::str::from_utf8(&default_sysroot).unwrap().trim();
let extra_ld_lib_path =
default_sysroot.to_string() + ":" + sysroot.join("lib").to_str().unwrap();
if cfg!(target_os = "macos") {
env::set_var(
"DYLD_LIBRARY_PATH",
env::var("DYLD_LIBRARY_PATH").unwrap_or(String::new()) + ":" + &extra_ld_lib_path,
);
} else if cfg!(unix) {
env::set_var(
"LD_LIBRARY_PATH",
env::var("LD_LIBRARY_PATH").unwrap_or(String::new()) + ":" + &extra_ld_lib_path,
);
}
// Ensure that the right toolchain is used
env::set_var("RUSTUP_TOOLCHAIN", env!("RUSTUP_TOOLCHAIN"));

3
scripts/config.sh
View File

@ -2,6 +2,5 @@
set -e
dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/../build"; pwd)
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib:"$dir"/lib"
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH