Skip to content

Commit fee16b1

Browse files
committed
Merge bitcoin/bitcoin#23744: build, qt: Drop support for i686-linux-android host
66a20a5 build, qt: Drop support for `i686-linux-android` host (Hennadii Stepanov) Pull request description: There are no reasons to keep support for `i686-linux-android` host, which is actually broken in master (50c502f), and this fact has been unnoticed for months :) bitcoin/bitcoin#23675 (comment): > I'm surprised `i686-linux-android` ABI is still supported. I would love to drop it... bitcoin/bitcoin#23675 (comment) > What is `i686-linux-android`? 32-bit x86 android? is that really a thing? ACKs for top commit: prusnak: utACK 66a20a5 Tree-SHA512: 211f794de2fc569f0ade2a4da805b8bfd4ce2ab0930c5d427acc4f5d015fcdc4911f02fc64f6401197f7641aed79944a9594be80c817547be3269cdd721cf79b
2 parents 216f4ca + 66a20a5 commit fee16b1

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

configure.ac

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -776,10 +776,7 @@ case $host in
776776
*armv7a*)
777777
ANDROID_ARCH=armeabi-v7a
778778
;;
779-
*i686*)
780-
ANDROID_ARCH=i686
781-
;;
782-
*) AC_MSG_ERROR([Could not determine Android arch]) ;;
779+
*) AC_MSG_ERROR([Could not determine Android arch, or it is unsupported]) ;;
783780
esac
784781
;;
785782
*linux*)

depends/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Common `host-platform-triplet`s for cross compilation are:
3838
- `s390x-linux-gnu` for Linux S390X
3939
- `armv7a-linux-android` for Android ARM 32 bit
4040
- `aarch64-linux-android` for Android ARM 64 bit
41-
- `i686-linux-android` for Android x86 32 bit
4241
- `x86_64-linux-android` for Android x86 64 bit
4342

4443
The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md).

depends/packages/qt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ $(package)_config_opts_android += -no-feature-vulkan
181181
$(package)_config_opts_aarch64_android += -android-arch arm64-v8a
182182
$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
183183
$(package)_config_opts_x86_64_android += -android-arch x86_64
184-
$(package)_config_opts_i686_android += -android-arch i686
185184
endef
186185

187186
define $(package)_fetch_cmds

0 commit comments

Comments
 (0)