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.

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

Fixes for VxWorks #75758

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Fixes for VxWorks #75758

merged 1 commit into from
Aug 27, 2020

Conversation

bpangWR
Copy link
Contributor

@bpangWR bpangWR commented Aug 21, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 21, 2020
@bpangWR
Copy link
Contributor Author

bpangWR commented Aug 24, 2020

@jyn514

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

@jyn514
Copy link
Member

jyn514 commented Aug 24, 2020

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

@bpangWR
Copy link
Contributor Author

bpangWR commented Aug 24, 2020

r? @Mark-Simulacrum

Can you help to review the code?

Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

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.

@@ -857,6 +857,10 @@ impl Build {
if let Some(linker) = self.config.target_config.get(&target).and_then(|c| c.linker.as_ref())
{
Some(linker)
} else if target.contains("vxworks") {
/* need to use CXX compiler as linker to resolve the execption functions
Copy link
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

fix building errors
use wr-c++ as linker
@bpangWR
Copy link
Contributor Author

bpangWR commented Aug 25, 2020

r=@Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

Thanks!

@bors
Copy link
Contributor

bors commented Aug 25, 2020

📌 Commit 079baaf 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 Aug 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2020
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:master Aug 27, 2020
@cuviper cuviper added this to the 1.48.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

7 participants