diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-06-20 14:40:49 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-06-20 14:40:49 +0200 |
| commit | 03c9ecfb306f00fa39595c63d062f7ab98d6f19f (patch) | |
| tree | 2e7c3a822a3a0a46b6151656e04ad9eadeb00e51 | |
| parent | 62e49c5b61c196c942e644c0b81b0f4b232bd461 (diff) | |
| download | rust-03c9ecfb306f00fa39595c63d062f7ab98d6f19f.tar.gz rust-03c9ecfb306f00fa39595c63d062f7ab98d6f19f.zip | |
Remove unnecessary LD_LIBRARY_PATH parts
| -rw-r--r-- | scripts/cargo.rs | 14 | ||||
| -rw-r--r-- | scripts/config.sh | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/scripts/cargo.rs b/scripts/cargo.rs index fdb9bcf6dbc..5cb352a1aff 100644 --- a/scripts/cargo.rs +++ b/scripts/cargo.rs @@ -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")); diff --git a/scripts/config.sh b/scripts/config.sh index cf325ab574e..d316a7c6981 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -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 |