diff options
| author | bors <bors@rust-lang.org> | 2016-04-23 01:18:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-23 01:18:03 -0700 |
| commit | ef57fb714402286532932371b667abda5fe874f3 (patch) | |
| tree | a6ce649cc14a16d5cc7bb1b2c0f293d9833661b9 /src/bootstrap | |
| parent | bb4b0d894364409c64087c622fdb173b52ad1005 (diff) | |
| parent | cbe6292c58feb643917c0959f95173a3c312fbd4 (diff) | |
Auto merge of #33084 - alexcrichton:osx-python-sanity, r=michaelwoerister
Sanity check Python on OSX for LLDB tests Two primary changes: * Don't get past the configure stage if `python` isn't coming from `/usr/bin` * Call `debugger.Terminate()` to prevent segfaults on newer versions of LLDB. Closes #32994
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/build/check.rs | 13 |
1 files changed, 12 insertions, 1 deletions
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); |
