Skip to content

Commit 0f2a65a

Browse files
nrcalexcrichton
authored andcommitted
Attempt to fix the component manifest problem for rls-preview
cc #44270
1 parent 133aefc commit 0f2a65a

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
@@ -1081,8 +1081,14 @@ impl Step for Rls {
10811081
.arg("--output-dir").arg(&distdir(build))
10821082
.arg("--non-installed-overlay").arg(&overlay)
10831083
.arg(format!("--package-name={}-{}", name, target))
1084-
.arg("--component-name=rls")
10851084
.arg("--legacy-manifest-dirs=rustlib,cargo");
1085+
1086+
if build.config.channel == "nightly" {
1087+
cmd.arg("--component-name=rls");
1088+
} else {
1089+
cmd.arg("--component-name=rls-preview");
1090+
}
1091+
10861092
build.run(&mut cmd);
10871093
distdir(build).join(format!("{}-{}.tar.gz", name, target))
10881094
}

0 commit comments

Comments
 (0)