about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-02-19 19:10:58 +0000
committerbors <bors@rust-lang.org>2020-02-19 19:10:58 +0000
commit7760cd0fbbbf2c59a625e075a5bdfa88b8e30f8a (patch)
tree4f54c12a071f99e56f766983da474f3c904da61a /src/bootstrap
parent7d6b8c414e84e1f4f2f40236e83125ba8e034b98 (diff)
parenta97f354767844680311da5252fe0c81ecfb9ed45 (diff)
downloadrust-7760cd0fbbbf2c59a625e075a5bdfa88b8e30f8a.tar.gz
rust-7760cd0fbbbf2c59a625e075a5bdfa88b8e30f8a.zip
Auto merge of #69293 - Dylan-DPC:rollup-imcbvgo, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #68863 (ci: switch macOS builders to 10.15)
 - #69142 (Add shared script for linkchecking books.)
 - #69248 (Don't eliminate frame pointers on thumb targets)
 - #69280 (Remove special case for `simd_shuffle` arg promotion)
 - #69284 (Reword OpenOptions::{create, create_new} doc.)

Failed merges:

r? @ghost
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c680d124f1f..f939f79e4f4 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1051,10 +1051,10 @@ impl Step for Compiletest {
         cmd.arg("--docck-python").arg(builder.python());
 
         if builder.config.build.ends_with("apple-darwin") {
-            // Force /usr/bin/python on macOS for LLDB tests because we're loading the
+            // Force /usr/bin/python3 on macOS 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");
+            cmd.arg("--lldb-python").arg("/usr/bin/python3");
         } else {
             cmd.arg("--lldb-python").arg(builder.python());
         }