Skip to content

Fixes for VxWorks - #75758

Merged
bors merged 1 commit into
rust-lang:masterfrom
bpangWR:master
Aug 27, 2020
Merged

Fixes for VxWorks#75758
bors merged 1 commit into
rust-lang:masterfrom
bpangWR:master

Conversation

@bpangWR

@bpangWRbpangWR commented Aug 21, 2020

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 21, 2020
jyn514
jyn514 reviewed Aug 21, 2020
View reviewed changes
Comment threadlibrary/std/src/sys/vxworks/process/process_common.rs Outdated
Comment threadlibrary/std/src/sys/vxworks/process/process_common.rs Outdated
Comment threadlibrary/std/src/sys/vxworks/process/process_common.rs Outdated
@bpangWR

bpangWR commented Aug 24, 2020

Copy link
Copy Markdown
ContributorAuthor

@jyn514

Thanks for helping with the review. Please let me know if there is any change I should do in the code.

@jyn514

jyn514 commented Aug 24, 2020

Copy link
Copy Markdown
Member

I'm not comfortable reviewing the changes in bootstrap. Maybe @Mark-Simulacrum is interested?

@bpangWR

bpangWR commented Aug 24, 2020

Copy link
Copy Markdown
ContributorAuthor

r? @Mark-Simulacrum

Can you help to review the code?

Mark-Simulacrum
Mark-Simulacrum reviewed Aug 24, 2020
View reviewed changes
Comment threadsrc/bootstrap/cc_detect.rs Outdated
Mark-Simulacrum
Mark-Simulacrum reviewed Aug 24, 2020
View reviewed changes
Comment threadsrc/bootstrap/lib.rs Outdated
Mark-Simulacrum
Mark-Simulacrum reviewed Aug 25, 2020
View reviewed changes

@Mark-SimulacrumMark-Simulacrum left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with nit fixed and comments switched to // comment syntax which is preferred in Rust.

Comment threadsrc/bootstrap/lib.rs Outdated

@Mark-SimulacrumMark-SimulacrumAug 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/* need to use CXX compiler as linker to resolve the execption functions
/* need to use CXX compiler as linker to resolve the exception functions

@bpangWR
For VxWorks:
079baaf
fix building errors
use wr-c++ as linker
@bpangWR

bpangWR commented Aug 25, 2020

Copy link
Copy Markdown
ContributorAuthor

r=@Mark-Simulacrum

@Mark-Simulacrum

Mark-Simulacrum commented Aug 25, 2020

Copy link
Copy Markdown
Member

@bors r+ rollup

Thanks!

@bors

bors commented Aug 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 079baaf has been approved by Mark-Simulacrum

@borsbors 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 Aug 25, 2020
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Aug 26, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2020
@bors
Auto merge ofrust-lang#75966- Dylan-DPC:rollup-srfpces, r=Dylan-DPC
09b06f9
Rollup of 10 pull requests
Successful merges:
- rust-lang#74730 (Hexagon libstd: update type defs)
- rust-lang#75758 (Fixes for VxWorks)
- rust-lang#75780 (Unconfuse Unpin docs a bit)
- rust-lang#75806 (Prevent automatic page change when using history)
- rust-lang#75818 (Update docs for SystemTime Windows implementation)
- rust-lang#75837 (Fix font color for help button in ayu and dark themes)
- rust-lang#75870 (Unify theme choices border color in ayu theme)
- rust-lang#75875 (Shorten liballoc vec resize intra-doc link)
- rust-lang#75953 (Fix swapped stability attributes for rustdoc lints)
- rust-lang#75958 (Avoid function-scoping global variables)
Failed merges:
r? @ghost
@bors
bors merged commit 730449d into rust-lang:masterAug 27, 2020
@cuvipercuviper added this to the 1.48.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments
+1 more reviewer
@jyn514jyn514jyn514 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

7 participants

@bpangWR@jyn514@Mark-Simulacrum@bors@cuviper@alexcrichton@rust-highfive