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

bootstrap: Default to a sensible llvm-suffix. #59173

Merged
merged 1 commit into from
Mar 16, 2019
Merged

bootstrap: Default to a sensible llvm-suffix. #59173

merged 1 commit into from
Mar 16, 2019

Conversation

emilio
Copy link
Contributor

@emilio emilio commented Mar 14, 2019

I used version-channel-sha, hopefully that should work.

I checked that bootstrap builds, but I cannot check anything else since the llvm
build process is started from cargo, and thus calls clang, and thus I hit the
same bug I hope to fix with this change.

Hopefully fixes #59034.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2019
@emilio emilio mentioned this pull request Mar 14, 2019
Closed
@emilio
Copy link
Contributor Author

emilio commented Mar 14, 2019

cc @Mark-Simulacrum @cuviper

@emilio
Copy link
Contributor Author

emilio commented Mar 14, 2019

Oh, I realize I can let my build progress a bit more if I do CC=gcc CXX=g++ ./x.py build.

@emilio
Copy link
Contributor Author

emilio commented Mar 14, 2019

r? @Mark-Simulacrum

@emilio
bootstrap: Default to a sensible llvm-suffix.
e7b7c41 
I used version-channel-sha, hopefully that should work.

I checked that bootstrap builds, but I cannot check anything else since the llvm
build process is started from cargo, and thus calls clang, and thus I hit the
same bug I hope to fix with this change.

Hopefully fixes rust-lang#59034.
@Mark-Simulacrum
Copy link
Member

Thanks!

I guess we'd need a beta backport to actually fix the in-tree llvm build? Presuming that's the case, let's so @rustbot modify labels: beta-nominated and beta-accepted.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 14, 2019

📌 Commit e7b7c41 has been approved by Mark-Simulacrum

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Mar 14, 2019
@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 Mar 14, 2019
@Centril
Copy link
Contributor

Centril commented Mar 16, 2019

@bors p=7

@kennytm kennytm mentioned this pull request Mar 16, 2019
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 16, 2019
@kennytm
Rollup merge of rust-lang#59173 - emilio:llvm-suffix, r=Mark-Simulacrum
6ffcf97 
bootstrap: Default to a sensible llvm-suffix.

I used version-channel-sha, hopefully that should work.

I checked that bootstrap builds, but I cannot check anything else since the llvm
build process is started from cargo, and thus calls clang, and thus I hit the
same bug I hope to fix with this change.

Hopefully fixes rust-lang#59034.
bors added a commit that referenced this pull request Mar 16, 2019
@bors
Auto merge of #59226 - kennytm:rollup, r=kennytm
2c8bbf5 
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58959 (Add release notes for PR #56243)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)
 - #59231 (Stabilize Option::copied)
@bors bors merged commit e7b7c41 into rust-lang:master Mar 16, 2019
@emilio emilio mentioned this pull request Mar 18, 2019
Open
@emilio emilio deleted the llvm-suffix branch March 18, 2019 12:06
@pietroalbini pietroalbini mentioned this pull request Mar 19, 2019
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 19, 2019
bors added a commit that referenced this pull request Mar 19, 2019
@bors
Auto merge of #59295 - pietroalbini:beta-rollup, r=pietroalbini
d049c7b 
[beta] Rollup backports

Rolled up:

* [beta] Move to static.r-l.o stable release #58896

Cherry-picked:

* Add release notes for PR #56243 #58959
* resolve: Account for new importable entities #59047
* bootstrap: Default to a sensible llvm-suffix. #59173

r? @ghost
@ehuss ehuss mentioned this pull request Mar 19, 2019
Open
@glandium glandium mentioned this pull request Mar 26, 2019
Closed
rinon added a commit to immunant/c2rust that referenced this pull request Apr 10, 2019
@rinon
Update to nightly-2019-04-08
f706876 
We need rust-lang/rust#59173 to be in our nightly for
LLVM 8 builds against system libLLVM-8.so on linux.
rinon added a commit to immunant/c2rust that referenced this pull request Apr 10, 2019
@rinon
Bump rustc to nightly 2019-04-08 (#49)
65d1aba 
Major updates to translator:

- Remove ThinTokenStream
- Update AST
- Use libc crate instead of rustc internal version
- Add support for varargs

Major updates to the refactoring tool:

- Remove ThinTokenStream
- Update AST
- Replace Folder with in-place mutable Visitor
- Use new rustc driver interface

Note: We need rust-lang/rust#59173 to be in our nightly for LLVM 8 builds against system libLLVM-8.so on linux.
@tmiasko tmiasko mentioned this pull request Feb 23, 2020
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 1, 2020
@JohnTitor
Rollup merge of rust-lang#69397 - tmiasko:llvm-version-suffix, r=nagisa
1e25878 
bootstrap: Remove commit hash from LLVM version suffix to avoid rebuilds

The custom LLVM version suffix was introduced to avoid unintentional
library names conflicts. By default it included the LLVM submodule
commit hash. Changing the version suffix requires the complete LLVM
rebuild, and since then every change to the submodules required it as
well.

Remove the commit hash from version suffix to avoid complete rebuilds,
while leaving the `rust` string, the release number and release channel
to disambiguate the library name.

Context: version suffix was introduced by rust-lang#59173 as solution to rust-lang#59034.

Resolves rust-lang#68715.
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
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rust's libLLVM-8.so doesn't work with clang
8 participants
@emilio @rust-highfive @Mark-Simulacrum @bors @Centril @alexcrichton @pietroalbini @rustbot