From 68d977c5f0d7fd8347cd4e3a3229a84a9c66c631 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 16 May 2015 16:19:00 -0700 Subject: Support a system root with correct on-disk directory layout The existing code for setting up the environment assumes that the directory layout containing rust and cargo conforms to the one used by rust-installer's tarballs. This makes overriding the system root awkward for simple cases where I want to test my own build directly from the rust build directory. This patch just adds a second path to PATH and LD_LIBRARY_PATH to accomodate both disk layouts. Conflicts: python/servo/command_base.py --- python/servo/command_base.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'python') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 80811e30a04..ed8f9de2de8 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -167,12 +167,21 @@ class CommandBase(object): if not self.config["tools"]["system-rust"] \ or self.config["tools"]["rust-root"]: env["RUST_ROOT"] = self.config["tools"]["rust-root"] + # These paths are for when rust-root points to an unpacked installer extra_path += [path.join(self.config["tools"]["rust-root"], "rustc", "bin")] extra_lib += [path.join(self.config["tools"]["rust-root"], "rustc", "lib")] + # These paths are for when rust-root points to a rustc sysroot + extra_path += [path.join(self.config["tools"]["rust-root"], "bin")] + extra_lib += [path.join(self.config["tools"]["rust-root"], "lib")] + if not self.config["tools"]["system-cargo"] \ or self.config["tools"]["cargo-root"]: + # This path is for when rust-root points to an unpacked installer extra_path += [ path.join(self.config["tools"]["cargo-root"], "cargo", "bin")] + # This path is for when rust-root points to a rustc sysroot + extra_path += [ + path.join(self.config["tools"]["cargo-root"], "bin")] if extra_path: env["PATH"] = "%s%s%s" % ( -- cgit v1.2.3