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

Fix arch flag on i686-apple-darwin #105904

Merged
merged 1 commit into from
Dec 21, 2022

Conversation

MarcusCalhoun-Lopez
Copy link
Contributor

i686-apple-darwin should use -arch i386 instead of -arch i686

i686-apple-darwin should use `-arch i386` instead of `-arch i686`
@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2022

r? @Mark-Simulacrum

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2022
@bjorn3
Copy link
Member

bjorn3 commented Dec 20, 2022

Why exactly should -arch i386 be used for an i686 target? Does -arch i686 gives an error?

@MarcusCalhoun-Lopez
Copy link
Contributor Author

Why exactly should -arch i386 be used for an i686 target? Does -arch i686 gives an error?

Yes, that is correct.
-arch i386 is the correct way to specify 32-bit Intel architecture on macOS.
-arch i686 gives an error.

@bjorn3
Copy link
Member

bjorn3 commented Dec 20, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Dec 20, 2022

📌 Commit ee1a905 has been approved by bjorn3

It is now in the queue for this repository.

@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 Dec 20, 2022
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Dec 21, 2022
…86, r=bjorn3

Fix arch flag on i686-apple-darwin

i686-apple-darwin should use `-arch i386` instead of `-arch i686`
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2022
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#105791 (docs: add long error explanation for error E0472)
 - rust-lang#105897 (Fix an opaque type ICE)
 - rust-lang#105904 (Fix arch flag on i686-apple-darwin)
 - rust-lang#105949 (Bump `cfg-if` to `1.0` in rustc crates)
 - rust-lang#105964 (rustdoc: prevent CSS layout of line numbers shrinking into nothing)
 - rust-lang#105972 (rustdoc: simplify section anchor CSS)
 - rust-lang#105973 (Avoid going through the happy path in case of non-fn builtin calls)
 - rust-lang#105976 (Remove unused `check-stage2-T-arm-linux-androideabi-H-x86_64-unknown-linux-gnu` make rule)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2ddfa8f into rust-lang:master Dec 21, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 21, 2022
@MarcusCalhoun-Lopez MarcusCalhoun-Lopez deleted the darwin_arch_i386 branch December 21, 2022 23:05
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants