generated from RandyMcMillan/bitcoin
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge bitcoin/bitcoin#23678: build: Fix build for Android x86_64
8d6d708 build: Fix build for Android x86_64 (Hennadii Stepanov) Pull request description: bitcoin/bitcoin#23489 [introduced](bitcoin/bitcoin#23489 (comment)) a regression making build for `HOST=x86_64-linux-android` broken due to the [QTBUG-86785](https://bugreports.qt.io/browse/QTBUG-86785). This PR fixes this regression. ACKs for top commit: fanquake: ACK 8d6d708 Tree-SHA512: c841a56d745c4b4a75e1bc4d89752de153aa6328752a8fd7df614363ed046a291a9eb58605d82fcba21f3c8b0f0bf47786ed0a63c29f81f5d4ad9c0b12304100
- Loading branch information
Showing
2 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
Android: don't use avx and avx2 when building for Android x86_64 | ||
|
||
AVX and AVX2 are not supported on x86_64 ABI. | ||
See: | ||
- https://developer.android.com/ndk/guides/abis#86-64 | ||
- https://bugreports.qt.io/browse/QTBUG-86785 | ||
|
||
Upstream commits: | ||
- Qt 6.0: ff1a44be33f4bc05d502a2ca49171e0408992f61 | ||
- Qt 5.15: 8b2cc0f6deb038a4c9d4f0d9b690c7726bd809a9 | ||
|
||
|
||
--- old/qtbase/configure.json | ||
+++ new/qtbase/configure.json | ||
@@ -1098,7 +1098,7 @@ | ||
}, | ||
"avx": { | ||
"label": "AVX", | ||
- "condition": "features.sse4_2 && tests.avx", | ||
+ "condition": "features.sse4_2 && tests.avx && (!config.android || !arch.x86_64)", | ||
"output": [ | ||
"privateConfig", | ||
{ "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 } | ||
@@ -1114,7 +1114,7 @@ | ||
}, | ||
"avx2": { | ||
"label": "AVX2", | ||
- "condition": "features.avx && tests.avx2", | ||
+ "condition": "features.avx && tests.avx2 && (!config.android || !arch.x86_64)", | ||
"output": [ | ||
"privateConfig", | ||
"privateFeature", |