From cbe6292c58feb643917c0959f95173a3c312fbd4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 19 Apr 2016 09:44:19 -0700 Subject: mk: Force system python for LLDB tests on OSX Force usage of /usr/bin/python whenever we run LLDB tests on OSX because it looks like no other Python will work. --- src/bootstrap/build/check.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/bootstrap') diff --git a/src/bootstrap/build/check.rs b/src/bootstrap/build/check.rs index f145a7149fb..ec97ebcc832 100644 --- a/src/bootstrap/build/check.rs +++ b/src/bootstrap/build/check.rs @@ -81,8 +81,19 @@ pub fn compiletest(build: &Build, // FIXME: needs android support cmd.arg("--android-cross-path").arg(""); + // FIXME: CFG_PYTHON should probably be detected more robustly elsewhere - cmd.arg("--python").arg("python"); + let python_default = "python"; + cmd.arg("--docck-python").arg(python_default); + + if build.config.build.ends_with("apple-darwin") { + // Force /usr/bin/python on OSX for LLDB tests because we're loading the + // LLDB plugin's compiled module which only works with the system python + // (namely not Homebrew-installed python) + cmd.arg("--lldb-python").arg("/usr/bin/python"); + } else { + cmd.arg("--lldb-python").arg(python_default); + } if let Some(ref vers) = build.gdb_version { cmd.arg("--gdb-version").arg(vers); -- cgit 1.4.1-3-g733a5