Skip to content

Update cmake, cc and compiler_builtins for VS 2019 support #59799

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.

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

Merged
merged 4 commits into from
Apr 11, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Apr 8, 2019

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 8, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 8, 2019

📌 Commit d28234b7d4b449f85c0bd2ae9cc3db48f9bdee69 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 Apr 8, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 8, 2019

@bors p=1 so I won't be tempted to uninstall it

@Centril
Copy link
Contributor

Centril commented Apr 8, 2019

@bors p=10

Raising above rollup todo.

@bors
Copy link
Collaborator

bors commented Apr 8, 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 vs2019 (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 vs2019 --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
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
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 Apr 8, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 8, 2019

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 8, 2019

📌 Commit 044a3bfd433cc189b48e411207d0a58f8be4343b 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 Apr 8, 2019
@bors
Copy link
Collaborator

bors commented Apr 8, 2019

⌛ Testing commit 044a3bfd433cc189b48e411207d0a58f8be4343b with merge 562c19207fc8f40e0cdc55b6b92d25f9928d80c0...

@Manishearth
Copy link
Member

@bors retry

yielding priority to clippy PR

@bors
Copy link
Collaborator

bors commented Apr 9, 2019

⌛ Testing commit 044a3bfd433cc189b48e411207d0a58f8be4343b with merge 0540b7bee064d21eac7da9d8ac5c67672083e042...

@Manishearth
Copy link
Member

@bors retry

Yield priority to clippy PR which blocks the beta

@bors
Copy link
Collaborator

bors commented Apr 9, 2019

⌛ Testing commit 044a3bfd433cc189b48e411207d0a58f8be4343b with merge a6ab195db1fdeea173d6425e6afb414543d9eaf6...

@bors
Copy link
Collaborator

bors commented Apr 9, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Contributor

The job test-various of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:00b62aaf:start=1554782358430215926,finish=1554782358438344021,duration=8128095
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:096f5b17
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:03f7fb74
travis_time:start:03f7fb74
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:13eba951
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

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

Zoxc commented Apr 9, 2019

@alexcrichton Is this a cc-rs regression?

@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

Looks like we require a C compiler for wasm32, but we don't appear to use one. Added a fix for that.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 10, 2019

📌 Commit c44ad6a825a6748a19eaf2fb1b42c5eb9a79178c has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 10, 2019

🌲 The tree is currently closed for pull requests below priority 15, this pull request will be tested once the tree is reopened

@bors
Copy link
Collaborator

bors commented Apr 10, 2019

☔ The latest upstream changes (presumably #59810) 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 Apr 10, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 10, 2019

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 10, 2019

📌 Commit 7b28ddc 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 Apr 10, 2019
@bors
Copy link
Collaborator

bors commented Apr 11, 2019

⌛ Testing commit 7b28ddc with merge fd6f22f982ea911432d8f4ace17ca9341f1f058c...

@bors
Copy link
Collaborator

bors commented Apr 11, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Contributor

The job dist-x86_64-musl of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[02:59:14] [RUSTC-TIMING] parking_lot_core test:false 1.824
[02:59:14]    Compiling parking_lot v0.7.1
[02:59:15] [RUSTC-TIMING] parking_lot test:false 1.067
[02:59:15]    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
The job exceeded the maximum time limit for jobs, and has been terminated.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 11, 2019
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 11, 2019

@bors retry

@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 Apr 11, 2019
@bors
Copy link
Collaborator

bors commented Apr 11, 2019

⌛ Testing commit 7b28ddc with merge d21bebe...

bors added a commit that referenced this pull request Apr 11, 2019
Update cmake, cc and compiler_builtins for VS 2019 support

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Apr 11, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 11, 2019
@bors bors merged commit 7b28ddc into rust-lang:master Apr 11, 2019
@Zoxc Zoxc deleted the vs2019 branch April 11, 2019 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants