Skip to content

Support passing cflags/cxxflags/ldflags to LLVM build#57370

Merged
bors merged 1 commit intorust-lang:masterfrom
petrhosek:llvm-flags
Jan 19, 2019
Merged

Support passing cflags/cxxflags/ldflags to LLVM build#57370
bors merged 1 commit intorust-lang:masterfrom
petrhosek:llvm-flags

Conversation

@petrhosek
Copy link
Contributor

@petrhosek petrhosek commented Jan 6, 2019

This may be needed with some host compilers.

@rust-highfive
Copy link
Contributor

rust-highfive commented Jan 6, 2019

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 Jan 6, 2019
@alexcrichton
Copy link
Member

alexcrichton commented Jan 7, 2019

@bors: r+ rollup

👍

@bors
Copy link
Collaborator

bors commented Jan 7, 2019

📌 Commit cbe1d2bc4097711acb8248c62ec6ccfea8791677 has been approved by alexcrichton

@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 Jan 7, 2019
@emilyalbini emilyalbini mentioned this pull request Jan 7, 2019
Merged
bors added a commit that referenced this pull request Jan 7, 2019
@bors
Auto merge of #57405 - pietroalbini:rollup, r=pietroalbini
59e70f2 
Rollup of 6 pull requests

Successful merges:

 - #57290 (remove outdated comment)
 - #57308 (Make CompileController thread-safe)
 - #57358 (use utf-8 throughout htmldocck)
 - #57369 (Provide the option to use libc++ even on all platforms)
 - #57375 (Add duration constants)
 - #57403 (Make extern ref HTTPS)

Failed merges:

 - #57370 (Support passing cflags/cxxflags/ldflags to LLVM build)

r? @ghost
@bors
Copy link
Collaborator

bors commented Jan 10, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout llvm-flags (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self llvm-flags --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging src/bootstrap/native.rs
Auto-merging src/bootstrap/configure.py
Auto-merging src/bootstrap/config.rs
CONFLICT (content): Merge conflict in src/bootstrap/config.rs
Auto-merging config.toml.example
CONFLICT (content): Merge conflict in config.toml.example
Automatic merge failed; fix conflicts and then commit the result.

@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 Jan 10, 2019
@petrhosek
Support passing cflags/cxxflags/ldflags to LLVM build
c663272 
This may be needed with some host compilers.
@cramertj
Copy link
Member

cramertj commented Jan 15, 2019

@bors r=alexcrichton rollup

@bors
Copy link
Collaborator

bors commented Jan 15, 2019

📌 Commit c663272 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
@Centril
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
4c78836 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@Centril Centril mentioned this pull request Jan 17, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
@Centril
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
0ddccf1 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@Centril Centril mentioned this pull request Jan 17, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
@Centril
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
8b38c28 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@Centril Centril mentioned this pull request Jan 17, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
@Centril
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
845106f 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@Centril Centril mentioned this pull request Jan 18, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
@Centril
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
d136645 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@Centril Centril mentioned this pull request Jan 18, 2019
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 18, 2019
@GuillaumeGomez
Rollup merge of rust-lang#57370 - petrhosek:llvm-flags, r=alexcrichton
27ba06c 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 18, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Jan 19, 2019

@bors rollup-

@bors
Copy link
Collaborator

bors commented Jan 19, 2019

⌛ Testing commit c663272 with merge 286ac62...

bors added a commit that referenced this pull request Jan 19, 2019
@bors
Auto merge of #57370 - petrhosek:llvm-flags, r=alexcrichton
286ac62 
Support passing cflags/cxxflags/ldflags to LLVM build

This may be needed with some host compilers.
@bors
Copy link
Collaborator

bors commented Jan 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 286ac62 to master...

@bors bors merged commit c663272 into rust-lang:master Jan 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

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.

6 participants

@petrhosek @rust-highfive @alexcrichton @bors @cramertj @Centril