Rollup merge of rust-lang#44356 - nrc:rls-component-manifest, r=@alex…

…crichton Attempt to fix the component manifest problem for rls-preview cc rust-lang#44270 See rust-lang#44270
frewsxcv · Sep 11, 2017 · 86402ad · 86402ad
2 parents 31023b0 + 1ffc3dd
commit 86402ad
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -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))
     }