diff options
| author | kennytm <kennytm@gmail.com> | 2018-08-21 01:20:19 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-08-21 17:51:44 +0800 |
| commit | c980ba75fcc64af4c42c08311e4a22fbbe77a066 (patch) | |
| tree | ce87b21c75889ec914752d451ac1e636314e39df /src | |
| parent | 2a0d72075e8b4d13f20f10c9e58ef0728a687583 (diff) | |
| parent | c37787eb932e8586c80ccc4da757fd532bce84f6 (diff) | |
| download | rust-c980ba75fcc64af4c42c08311e4a22fbbe77a066.tar.gz rust-c980ba75fcc64af4c42c08311e4a22fbbe77a066.zip | |
Rollup merge of #53452 - tromey:lldb-manifest-fix, r=alexcrichton
Change target triple used to check for lldb in build-manifest The wrong target triple was used for lldb in build-manifest. lldb is only built for macOS, so update the triple to reflect that. This is an attempt to fix bug#48168.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index ee1345c7f94..76c15f6601a 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -273,7 +273,8 @@ impl Builder { self.clippy_version = self.version("clippy", "x86_64-unknown-linux-gnu"); self.rustfmt_version = self.version("rustfmt", "x86_64-unknown-linux-gnu"); self.llvm_tools_version = self.version("llvm-tools", "x86_64-unknown-linux-gnu"); - self.lldb_version = self.version("lldb", "x86_64-unknown-linux-gnu"); + // lldb is only built for macOS. + self.lldb_version = self.version("lldb", "x86_64-apple-darwin"); self.rust_git_commit_hash = self.git_commit_hash("rust", "x86_64-unknown-linux-gnu"); self.cargo_git_commit_hash = self.git_commit_hash("cargo", "x86_64-unknown-linux-gnu"); |