Fix several issues during cross compiling #98328

topjohnwu · 2022-06-21T08:44:40Z

When cross compiling LLVM on an arm64 macOS machine to x86_64, CMake will produce universal binaries by default, causing link errors. Explicitly set CMAKE_OSX_ARCHITECTURES to the one single target architecture so that the executables and libraries will be single architecture.
When cross compiling rustc with llvm.clang = true, CLANG_TABLEGEN has to be set to the host clang-tblgen executable to build clang.

rust-highfive · 2022-06-21T08:44:44Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

topjohnwu · 2022-06-23T16:45:20Z

@jyn514 since you've reviewed my other PR, would you want to check this out too?

jyn514 · 2022-06-23T16:51:48Z

When cross compiling LLVM on an arm64 macOS machine to x86_64, CMake will produce universal binaries by default, causing link errors.

Why does this cause link errors?

src/bootstrap/native.rs

topjohnwu · 2022-06-23T16:55:52Z

I don't actually know why, but the linker will complain file too small for architecture. I think it's quite important that we do NOT build universal binaries for LLVM, as the rest of rustc does not.

jyn514 · 2022-06-23T16:56:49Z

Hmm, ok, seems good to have LLVM's build be consistent with rustc's.

jyn514 · 2022-06-23T22:02:28Z

@bors r+

bors · 2022-06-23T22:02:30Z

📌 Commit 91c7dd0 has been approved by jyn514

Fix several issues during cross compiling - When cross compiling LLVM on an arm64 macOS machine to x86_64, CMake will produce universal binaries by default, causing link errors. Explicitly set `CMAKE_OSX_ARCHITECTURES` to the one single target architecture so that the executables and libraries will be single architecture. - When cross compiling rustc with `llvm.clang = true`, `CLANG_TABLEGEN` has to be set to the host `clang-tblgen` executable to build clang.

JohnTitor · 2022-06-24T07:43:14Z

Failed in rollup: #98442 (comment)
@bors r-

topjohnwu · 2022-06-24T11:25:42Z

@jyn514 turns out that LLVM_NM might still be required for cross compiling on MSVC. I added it back, hopefully this time all ci tests will pass 🙏

@JohnTitor I have pushed a new update to the PR

src/bootstrap/native.rs

jyn514 · 2022-06-25T14:17:03Z

@bors r+

bors · 2022-06-25T14:17:05Z

📌 Commit 7180afb has been approved by jyn514

Fix several issues during cross compiling - When cross compiling LLVM on an arm64 macOS machine to x86_64, CMake will produce universal binaries by default, causing link errors. Explicitly set `CMAKE_OSX_ARCHITECTURES` to the one single target architecture so that the executables and libraries will be single architecture. - When cross compiling rustc with `llvm.clang = true`, `CLANG_TABLEGEN` has to be set to the host `clang-tblgen` executable to build clang.

When cross compiling LLVM on an arm64 machine to x86_64, CMake will produce universal binaries by default, causing link errors. Explicitly set CMAKE_OSX_ARCHITECTURES to the one single target architecture.

When cross compiling rustc with `llvm.clang = true`, CLANG_TABLEGEN has to be set to the host clang-tblgen executable to build clang.

topjohnwu · 2022-07-04T07:04:55Z

@jyn514 hello, I have added a few changes to my PR

Only check the existence of clang-tblgen if not during a dry run
Add a fix to the libLLVM.dylib symlink workaround. More details in the commit message

r? @jyn514

jyn514 · 2022-07-04T07:13:17Z

@bors r-

@topjohnwu can we please merge the existing changes before you add more? You can make a new PR if you want to get a review before this one is merged.

topjohnwu · 2022-07-04T08:37:04Z

@jyn514 sure, I'll split the 3rd commit into its own PR

jyn514 · 2022-07-04T13:59:28Z

@bors r+

bors · 2022-07-04T13:59:30Z

📌 Commit 600026a has been approved by jyn514

bors · 2022-07-09T10:45:33Z

⌛ Testing commit 600026a with merge 73443a0...

alex · 2022-07-09T12:00:54Z

@jyn514 fwiw the source of those errors is #55235

bors · 2022-07-09T14:46:24Z

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing 73443a0 to master...

rust-timer · 2022-07-09T16:00:45Z

Finished benchmarking commit (73443a0): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: 🎉 relevant improvements found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-4.6%	-8.7%	4
All 😿🎉 (primary)	N/A	N/A	0

Cycles

Results

Primary benchmarks: mixed results
Secondary benchmarks: 🎉 relevant improvement found

	mean¹	max	count²
Regressions 😿 (primary)	3.5%	3.7%	2
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-7.1%	-7.1%	1
Improvements 🎉 (secondary)	-2.2%	-2.2%	1
All 😿🎉 (primary)	-0.1%	-7.1%	3

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

rust-highfive assigned Mark-Simulacrum Jun 21, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2022

jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jun 23, 2022

jyn514 reviewed Jun 23, 2022

View reviewed changes

src/bootstrap/native.rs Show resolved Hide resolved

src/bootstrap/native.rs Outdated Show resolved Hide resolved

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 Jun 23, 2022

JohnTitor mentioned this pull request Jun 24, 2022

Rollup of 8 pull requests #98442

Closed

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 Jun 24, 2022

topjohnwu requested a review from jyn514 June 24, 2022 12:06

jyn514 reviewed Jun 24, 2022

View reviewed changes

src/bootstrap/native.rs Show resolved Hide resolved

topjohnwu requested a review from jyn514 June 25, 2022 10:59

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 Jun 25, 2022

JohnTitor mentioned this pull request Jun 26, 2022

Rollup of 5 pull requests #98557

Closed

GuillaumeGomez mentioned this pull request Jun 29, 2022

Rollup of 12 pull requests #98663

Closed

topjohnwu added 2 commits July 3, 2022 23:49

Fix cross compiling on macOS

ce9e719

When cross compiling LLVM on an arm64 machine to x86_64, CMake will produce universal binaries by default, causing link errors. Explicitly set CMAKE_OSX_ARCHITECTURES to the one single target architecture.

Set CLANG_TABLEGEN when cross compiling clang

600026a

When cross compiling rustc with `llvm.clang = true`, CLANG_TABLEGEN has to be set to the host clang-tblgen executable to build clang.

rust-highfive assigned jyn514 and unassigned Mark-Simulacrum Jul 4, 2022

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 Jul 4, 2022

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 Jul 4, 2022

RalfJung mentioned this pull request Jul 6, 2022

Rollup of 5 pull requests #98970

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 9, 2022

bors merged commit 73443a0 into rust-lang:master Jul 9, 2022

rustbot added this to the 1.64.0 milestone Jul 9, 2022

eddyb mentioned this pull request Jul 12, 2022

Big file size regression on Windows #99143

Closed

topjohnwu deleted the fix_cross branch July 12, 2022 22:16

Fix several issues during cross compiling #98328

Fix several issues during cross compiling #98328

Uh oh!

Conversation

topjohnwu commented Jun 21, 2022

Uh oh!

rust-highfive commented Jun 21, 2022

Uh oh!

topjohnwu commented Jun 23, 2022

Uh oh!

jyn514 commented Jun 23, 2022

Uh oh!

Uh oh!

Uh oh!

topjohnwu commented Jun 23, 2022

Uh oh!

jyn514 commented Jun 23, 2022

Uh oh!

jyn514 commented Jun 23, 2022

Uh oh!

bors commented Jun 23, 2022

Uh oh!

JohnTitor commented Jun 24, 2022

Uh oh!

topjohnwu commented Jun 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jyn514 commented Jun 25, 2022

Uh oh!

bors commented Jun 25, 2022

Uh oh!

topjohnwu commented Jul 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jyn514 commented Jul 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

topjohnwu commented Jul 4, 2022

Uh oh!

jyn514 commented Jul 4, 2022

Uh oh!

bors commented Jul 4, 2022

Uh oh!

bors commented Jul 9, 2022

Uh oh!

alex commented Jul 9, 2022

Uh oh!

bors commented Jul 9, 2022

Uh oh!

rust-timer commented Jul 9, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Uh oh!

topjohnwu commented Jun 24, 2022 •

edited

Loading

topjohnwu commented Jul 4, 2022 •

edited

Loading

jyn514 commented Jul 4, 2022 •

edited

Loading