diff options
author | fanquake <fanquake@gmail.com> | 2021-11-25 20:06:27 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-11-25 20:06:40 +0800 |
commit | 0d7ecd5bef91710d29b8fcd533938020e634dd2d (patch) | |
tree | f8f42b29a54e5d892b30875d78eca3bc1d9b15b7 /configure.ac | |
parent | 76392b042e98fcdb3b7ce3c2023003910326d14e (diff) | |
parent | d0204199d6aad3dc581467b0679b46ac109ed08d (diff) |
Merge bitcoin/bitcoin#23583: build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake
d0204199d6aad3dc581467b0679b46ac109ed08d Revert "doc: Install Rosetta on M1-macOS for qt in depends" (Hennadii Stepanov)
f6e278167595b9f6f7f5d5f8b333d1b6c5f0b40b build, qt, macOS: Don't pass -device-option when building natively (Hennadii Stepanov)
667f0689ca03a03350e15d919bed531dffbb8523 build, qt, macOS: Don't hard-code x86_64 as the arch when using qmake (Hennadii Stepanov)
Pull request description:
On master (4018e23aa7e7bb57d721c7c41c55dfbb659b8c34) the Qt build system hard-coded the x86_64 as the architecture when using qmake.
This means that compiling the `qt` package on M1 Apple Silicon for the same system, i.e., without providing the `HOST` variable,—that is supposed to be compiled natively—is a cross-compiling actually:
```
% make -C depends qt_configured
...
Configure summary:
Building on: macx-clang (x86_64, CPU features: cx16 mmx sse sse2 sse3 ssse3 sse4.1)
Building for: macx-clang (arm64, CPU features: neon crc32)
Target compiler: clang (Apple) 13.0.0
Configuration: cross_compile largefile neon precompile_header silent release c++11 c++14 c++1z reduce_exports static stl
...
```
Also this bug caused another [issue](https://github.com/bitcoin/bitcoin/pull/22402) which currently is worked around by installing Rosetta.
With this PR it is no longer needed to have Rosetta installed on M1-based macOS, and:
```
% make -C depends qt_configured
...
Configure summary:
Build type: macx-clang (arm64, CPU features: neon crc32)
Compiler: clang (Apple) 13.0.0
Configuration: largefile neon precompile_header silent release c++11 c++14 c++1z reduce_exports static stl
...
```
ACKs for top commit:
promag:
Tested ACK d0204199d6aad3dc581467b0679b46ac109ed08d
fanquake:
ACK d0204199d6aad3dc581467b0679b46ac109ed08d
Tree-SHA512: 2fcd88d172286b7d22ec7ea7ce0939b012211c0160df56de2f4cb69e99743c71df6b6ff4777c1722ec22b974f48a77cc22e7c14d7d64d02c4f82ac22bafe4087
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions