Skip to content

Commit 03c9ecf

Browse files
committed
Remove unnecessary LD_LIBRARY_PATH parts
1 parent 62e49c5 commit 03c9ecf

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

scripts/cargo.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,6 @@ fn main() {
4141
.stdout;
4242
let default_sysroot = std::str::from_utf8(&default_sysroot).unwrap().trim();
4343

44-
let extra_ld_lib_path =
45-
default_sysroot.to_string() + ":" + sysroot.join("lib").to_str().unwrap();
46-
if cfg!(target_os = "macos") {
47-
env::set_var(
48-
"DYLD_LIBRARY_PATH",
49-
env::var("DYLD_LIBRARY_PATH").unwrap_or(String::new()) + ":" + &extra_ld_lib_path,
50-
);
51-
} else if cfg!(unix) {
52-
env::set_var(
53-
"LD_LIBRARY_PATH",
54-
env::var("LD_LIBRARY_PATH").unwrap_or(String::new()) + ":" + &extra_ld_lib_path,
55-
);
56-
}
57-
5844
// Ensure that the right toolchain is used
5945
env::set_var("RUSTUP_TOOLCHAIN", env!("RUSTUP_TOOLCHAIN"));
6046

scripts/config.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22

33
set -e
44

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

0 commit comments

Comments
 (0)