Skip to content

Commit 5ebf810

Browse files
Rollup merge of rust-lang#44356 - nrc:rls-component-manifest, r=@alexcrichton
Attempt to fix the component manifest problem for rls-preview cc rust-lang#44270 See rust-lang#44270
2 parents 3d93a53 + 1ffc3dd commit 5ebf810

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/bootstrap/dist.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1098,8 +1098,14 @@ impl Step for Rls {
10981098
.arg("--output-dir").arg(&distdir(build))
10991099
.arg("--non-installed-overlay").arg(&overlay)
11001100
.arg(format!("--package-name={}-{}", name, target))
1101-
.arg("--component-name=rls")
11021101
.arg("--legacy-manifest-dirs=rustlib,cargo");
1102+
1103+
if build.config.channel == "nightly" {
1104+
cmd.arg("--component-name=rls");
1105+
} else {
1106+
cmd.arg("--component-name=rls-preview");
1107+
}
1108+
11031109
build.run(&mut cmd);
11041110
distdir(build).join(format!("{}-{}.tar.gz", name, target))
11051111
}

0 commit comments

Comments
 (0)