Skip to content

Rollup of 9 pull requests #44599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

Rollup of 9 pull requests #44599

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a095ee4
Add class for codeblocks
GuillaumeGomez Sep 6, 2017
9c12e5d
add test
GuillaumeGomez Sep 7, 2017
79f888d
Add arrow and improve display
GuillaumeGomez Sep 9, 2017
81ebab6
bump gcc for bootstrap
QuietMisdreavus Sep 12, 2017
5cad391
rustc: Spawn `cmd /c emcc.bat` explicitly
alexcrichton Sep 13, 2017
d3bbce7
bring TyCtxt into scope
qmx Sep 8, 2017
39c9a3d
Attempt to fix the component manifest problem for rls-preview
nrc Sep 5, 2017
ddd321d
travis: Move sccache to the us-west-1 region
alexcrichton Sep 14, 2017
2bde694
bring TyCtxt into scope
qmx Sep 15, 2017
3fe4612
bring Ty into scope
qmx Sep 15, 2017
a7817dd
rustc: Preallocate when building the dep graph
alexcrichton Sep 15, 2017
07494ec
Require +thumb-mode to generate thumb2 code for Android/armv7-a
makotokato Sep 15, 2017
5398e03
stabilized ord_max_min (fixes #25663)
budziq Sep 15, 2017
0c39a5a
Rollup merge of #44356 - nrc:rls-component-manifest, r=@alexcrichton
GuillaumeGomez Sep 15, 2017
09baee8
Rollup merge of #44397 - GuillaumeGomez:codeblock-color, r=QuietMisdr…
GuillaumeGomez Sep 15, 2017
06f973b
Rollup merge of #44531 - QuietMisdreavus:bump-gcc, r=alexcrichton
GuillaumeGomez Sep 15, 2017
cdc78e5
Rollup merge of #44542 - alexcrichton:fix-windows-emscripten, r=nikom…
GuillaumeGomez Sep 15, 2017
6868419
Rollup merge of #44560 - qmx:import-TyCtxt, r=eddyb
GuillaumeGomez Sep 15, 2017
00e8846
Rollup merge of #44574 - alexcrichton:new-sccache-region, r=aidanhs
GuillaumeGomez Sep 15, 2017
56b3922
Rollup merge of #44586 - alexcrichton:smaller-query, r=michaelwoerister
GuillaumeGomez Sep 15, 2017
a0f6aaa
Rollup merge of #44589 - makotokato:thumb2, r=alexcrichton
GuillaumeGomez Sep 15, 2017
5e9b68f
Rollup merge of #44593 - budziq:stabilize_ord_max_min, r=alexcrichton
GuillaumeGomez Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Attempt to fix the component manifest problem for rls-preview 
cc #44270
  • Loading branch information
@nrc
nrc committed Sep 14, 2017
commit 39c9a3d7961df049d77660131033c003e24364a3
17 changes: 13 additions & 4 deletions src/bootstrap/dist.rs
View file
Open in desktop
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