diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2018-06-30 14:40:36 -0500 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2018-06-30 14:40:36 -0500 |
| commit | 6531879e91aebd4be282ccafeb761c19b3116a31 (patch) | |
| tree | 0d21d0829a386e50ab57197419a2984cf8adc03d | |
| parent | c67566ac27b7f578596cb4cc9811d04fdc2eb8e4 (diff) | |
| download | rust-6531879e91aebd4be282ccafeb761c19b3116a31.tar.gz rust-6531879e91aebd4be282ccafeb761c19b3116a31.zip | |
more s/llvm-tools/llvm-tools-preview/
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 35fc2182313..6add6495a93 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -298,11 +298,11 @@ impl Builder { self.package("rls-preview", &mut manifest.pkg, HOSTS); self.package("rustfmt-preview", &mut manifest.pkg, HOSTS); self.package("rust-analysis", &mut manifest.pkg, TARGETS); - self.package("llvm-tools", &mut manifest.pkg, TARGETS); + self.package("llvm-tools-preview", &mut manifest.pkg, TARGETS); let rls_present = manifest.pkg.contains_key("rls-preview"); let rustfmt_present = manifest.pkg.contains_key("rustfmt-preview"); - let llvm_tools_present = manifest.pkg.contains_key("llvm-tools"); + let llvm_tools_present = manifest.pkg.contains_key("llvm-tools-preview"); if rls_present { manifest.renames.insert("rls".to_owned(), Rename { to: "rls-preview".to_owned() }); @@ -359,7 +359,7 @@ impl Builder { } if llvm_tools_present { extensions.push(Component { - pkg: "llvm-tools".to_string(), + pkg: "llvm-tools-preview".to_string(), target: host.to_string(), }); } @@ -486,7 +486,7 @@ impl Builder { &self.rls_version } else if component == "rustfmt" || component == "rustfmt-preview" { &self.rustfmt_version - } else if component == "llvm-tools" { + } else if component == "llvm-tools" || component == "llvm-tools-preview" { &self.llvm_tools_version } else { &self.rust_version @@ -500,7 +500,7 @@ impl Builder { &self.rls_git_commit_hash } else if component == "rustfmt" || component == "rustfmt-preview" { &self.rustfmt_git_commit_hash - } else if component == "llvm-tools" { + } else if component == "llvm-tools" || component == "llvm-tools-preview" { &self.llvm_tools_git_commit_hash } else { &self.rust_git_commit_hash |