nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Haiku: add missing cases of using LIBRARY_PATH

Browse Source
This commit is contained in:
Jessica Hamilton 2017-04-24 14:21:36 +00:00
parent e1afddc29c
commit 0d63f13378
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/bootstrap.py
View File

@ -367,6 +367,9 @@ class RustBuild(object):
env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \ env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
(os.pathsep + env["DYLD_LIBRARY_PATH"]) \ (os.pathsep + env["DYLD_LIBRARY_PATH"]) \
if "DYLD_LIBRARY_PATH" in env else "" if "DYLD_LIBRARY_PATH" in env else ""
env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
(os.pathsep + env["LIBRARY_PATH"]) \
if "LIBRARY_PATH" in env else ""
env["PATH"] = os.path.join(self.bin_root(), "bin") + \ env["PATH"] = os.path.join(self.bin_root(), "bin") + \
os.pathsep + env["PATH"] os.pathsep + env["PATH"]
if not os.path.isfile(self.cargo()): if not os.path.isfile(self.cargo()):

2
src/bootstrap/util.rs
View File

@ -139,6 +139,8 @@ pub fn dylib_path_var() -> &'static str {
"PATH" "PATH"
} else if cfg!(target_os = "macos") { } else if cfg!(target_os = "macos") {
"DYLD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
} else if cfg!(target_os = "haiku") {
"LIBRARY_PATH"
} else { } else {
"LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
} }

2
src/librustc_back/dynamic_lib.rs
View File

@ -68,6 +68,8 @@ impl DynamicLibrary {
"PATH" "PATH"
} else if cfg!(target_os = "macos") { } else if cfg!(target_os = "macos") {
"DYLD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
} else if cfg!(target_os = "haiku") {
"LIBRARY_PATH"
} else { } else {
"LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
} }

2
src/tools/compiletest/src/procsrv.rs
View File

@ -20,6 +20,8 @@ pub fn dylib_env_var() -> &'static str {
"PATH" "PATH"
} else if cfg!(target_os = "macos") { } else if cfg!(target_os = "macos") {
"DYLD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
} else if cfg!(target_os = "haiku") {
"LIBRARY_PATH"
} else { } else {
"LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
} }