about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-02-19 18:12:07 +0100
committerGitHub <noreply@github.com>2020-02-19 18:12:07 +0100
commit2f914bf3278fa855ec0efa79698b8a481ff81b68 (patch)
tree5dbbab96a44a72a1c180d5a74d4b2579f4d19a32 /src/bootstrap
parent7710ae0e2653e0fa14ff9b7797ed29340e0284a8 (diff)
parent79c166ef73df00eac96aaeadcb326c972c22068c (diff)
downloadrust-2f914bf3278fa855ec0efa79698b8a481ff81b68.tar.gz
rust-2f914bf3278fa855ec0efa79698b8a481ff81b68.zip
Rollup merge of #68863 - pietroalbini:azure-macos-10.15, r=Mark-Simulacrum
ci: switch macOS builders to 10.15

Azure Pipelines is deprecating the macOS 10.13 image we're currently running, [and they plan to remove them](https://devblogs.microsoft.com/devops/removing-older-images-in-azure-pipelines-hosted-pools/) on March 23, 2020. This PR switches our macOS builders to macOS 10.15.

r? @Mark-Simulacrum
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 43561fa4f2f..3d6d4065fe8 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());
         }