diff options
| author | Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> | 2017-04-26 22:11:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 22:11:03 +0000 |
| commit | 639000ea2e1ff688ceea6d61dc257e53b5efa918 (patch) | |
| tree | bdd8d6adec2e903e12a865f399b1abb2c722621a /src/bootstrap | |
| parent | a3dde0b457b5c5fd736ce1ff1419d90646a93a15 (diff) | |
| parent | 0d63f13378f8d8625a439ecbb36b3f97d0d2263d (diff) | |
| download | rust-639000ea2e1ff688ceea6d61dc257e53b5efa918.tar.gz rust-639000ea2e1ff688ceea6d61dc257e53b5efa918.zip | |
Rollup merge of #41456 - jessicah:haiku-support, r=alexcrichton
Haiku: fix initial platform support
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 | ||||
| -rw-r--r-- | src/bootstrap/util.rs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 1dfc5593e5f..e5f8143b418 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -367,6 +367,9 @@ class RustBuild(object): env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \ (os.pathsep + env["DYLD_LIBRARY_PATH"]) \ 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") + \ os.pathsep + env["PATH"] if not os.path.isfile(self.cargo()): diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index dab20f44bc3..e01c06b10fc 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -139,6 +139,8 @@ pub fn dylib_path_var() -> &'static str { "PATH" } else if cfg!(target_os = "macos") { "DYLD_LIBRARY_PATH" + } else if cfg!(target_os = "haiku") { + "LIBRARY_PATH" } else { "LD_LIBRARY_PATH" } |