diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-12-05 00:27:55 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-12-11 08:15:25 +0200 |
| commit | 66a20a54a2a8446e6257b872a161089e0eed1688 (patch) | |
| tree | c2b44aa4192181dea91a6b90cf544f1a77a1baeb | |
| parent | 50c502f54abd9eb15c8ddca013f0fdfae3d132a9 (diff) | |
build, qt: Drop support for `i686-linux-android` host
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | depends/README.md | 1 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 45def0908b..52c6cbaef4 100644 --- a/configure.ac +++ b/configure.ac @@ -776,10 +776,7 @@ case $host in *armv7a*) ANDROID_ARCH=armeabi-v7a ;; - *i686*) - ANDROID_ARCH=i686 - ;; - *) AC_MSG_ERROR([Could not determine Android arch]) ;; + *) AC_MSG_ERROR([Could not determine Android arch, or it is unsupported]) ;; esac ;; *linux*) diff --git a/depends/README.md b/depends/README.md index d7fba754c4..2a39ed3907 100644 --- a/depends/README.md +++ b/depends/README.md @@ -38,7 +38,6 @@ Common `host-platform-triplet`s for cross compilation are: - `s390x-linux-gnu` for Linux S390X - `armv7a-linux-android` for Android ARM 32 bit - `aarch64-linux-android` for Android ARM 64 bit -- `i686-linux-android` for Android x86 32 bit - `x86_64-linux-android` for Android x86 64 bit The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md). diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 9824b5bebd..a7b354c0e3 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -182,7 +182,6 @@ $(package)_config_opts_android += -no-feature-vulkan $(package)_config_opts_aarch64_android += -android-arch arm64-v8a $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a $(package)_config_opts_x86_64_android += -android-arch x86_64 -$(package)_config_opts_i686_android += -android-arch i686 endef define $(package)_fetch_cmds |