Skip to content
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

Jump to bottom

Don't cross-compile Emscripten's LLVM #48093

Closed
wants to merge 1 commit into from
Closed

Don't cross-compile Emscripten's LLVM #48093

wants to merge 1 commit into from

Conversation

alexcrichton
Copy link
Member

Eventually the LLVM version of Emscripten and the main LLVM will diverge, and we
can't cross-compile an older version of LLVM using a newer version of LLVM's
llvm-config.

This is extracted from #47828

@alexcrichton
Don't cross-compile Emscripten's LLVM
866d13a 
Eventually the LLVM version of Emscripten and the main LLVM will diverge, and we
can't cross-compile an older version of LLVM using a newer version of LLVM's
`llvm-config`.
@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 9, 2018
@Mark-Simulacrum
Copy link
Member

So just to make sure this basically means that we'll be building emscripten LLVM completely (i.e., bootstrapping it) instead of cross compiling from an existing pre-built LLVM?

@alexcrichton
Copy link
Member Author

Nah it's actually a bit better than that! LLVM needs to be told that it's being cross compiled for situations like i686 -> ARM (dunno why). We were informing Emscripten that it was being cross compiled on the i686 builder when we were building from x86_64 -> i686, but this wasn't necessary.

Fuctionally this PR actually changes nothing, we still build LLVM the same number of times (aka Emscripten only once). It just means that when we upgrade LLVM away from Emscripten it'll actually work :)

@Mark-Simulacrum
Copy link
Member

Sounds good, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Feb 9, 2018

📌 Commit 866d13a has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2018
@alexcrichton
Copy link
Member Author

@bors: rollup

kennytm added a commit to kennytm/rust that referenced this pull request Feb 9, 2018
@kennytm
Rollup merge of rust-lang#48093 - alexcrichton:dont-cross-emscripten,…
e471747 
… r=Mark-Simulacrum

Don't cross-compile Emscripten's LLVM

Eventually the LLVM version of Emscripten and the main LLVM will diverge, and we
can't cross-compile an older version of LLVM using a newer version of LLVM's
`llvm-config`.

This is extracted from rust-lang#47828
@kennytm kennytm mentioned this pull request Feb 9, 2018
Closed
bors added a commit that referenced this pull request Feb 9, 2018
@bors
Auto merge of #48104 - kennytm:rollup, r=kennytm
394ccaf 
Rollup of 17 pull requests

- Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48085, #48086, #48090, #48093, #48098, #48101
- Failed merges:
@bors
Copy link
Contributor

bors commented Feb 10, 2018

☔ The latest upstream changes (presumably #47828) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2018
@kennytm
Copy link
Member

kennytm commented Feb 10, 2018

#47828 (which includes this change) has been merged, closing.

@kennytm kennytm closed this Feb 10, 2018
@alexcrichton alexcrichton deleted the dont-cross-emscripten branch June 29, 2018 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @Mark-Simulacrum @bors @kennytm @aturon