Skip to content

Commit

Permalink
Rollup merge of rust-lang#44356 - nrc:rls-component-manifest, r=@alex…
Browse files Browse the repository at this point in the history
…crichton

Attempt to fix the component manifest problem for rls-preview

cc rust-lang#44270

See rust-lang#44270
  • Loading branch information
GuillaumeGomez authored Sep 15, 2017
2 parents fd4bef5 + 39c9a3d commit 0c39a5a
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,14 @@ impl Step for Rls {
.arg("--output-dir").arg(&distdir(build))
.arg("--non-installed-overlay").arg(&overlay)
.arg(format!("--package-name={}-{}", name, target))
.arg("--component-name=rls")
.arg("--legacy-manifest-dirs=rustlib,cargo");

if build.config.channel == "nightly" {
cmd.arg("--component-name=rls");
} else {
cmd.arg("--component-name=rls-preview");
}

build.run(&mut cmd);
distdir(build).join(format!("{}-{}.tar.gz", name, target))
}
Expand Down Expand Up @@ -1302,9 +1308,12 @@ impl Step for Extended {
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target))
.join(format!("rust-std-{}", target)),
&exe.join("rust-std"));
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target))
.join("rls"),
&exe.join("rls"));
let rls_path = if build.config.channel == "nightly" {
work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls")
} else {
work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls-preview")
};
cp_r(&rls_path, &exe.join("rls"));
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target))
.join(format!("rust-analysis-{}", target)),
&exe.join("rust-analysis"));
Expand Down

0 comments on commit 0c39a5a

Please sign in to comment.