diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-25 23:02:59 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-25 23:06:39 +0300 |
| commit | cb7eba2a570e7830d53a21b7d534087c00b4cbd7 (patch) | |
| tree | 8896c0e79006bf8c9a15ce7dedbaee982568fcb2 /src/Makefile.qt.include | |
| parent | 860093401840d7aad7b439aeba0d1598933bc9c6 (diff) | |
| download | bitcoin-cb7eba2a570e7830d53a21b7d534087c00b4cbd7.tar.xz | |
build: Use Qt archive of the same version as the compiled binaries
This change fixes broken Android APK build when the `depends/sources`
directory contains Qt source archives of different versions (e.g., Qt
version update pull request in CI with the cached `depends/sources`
directory).
Diffstat (limited to 'src/Makefile.qt.include')
| -rw-r--r-- | src/Makefile.qt.include | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 30edb1e82d..8f52811e7c 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -382,7 +382,8 @@ bitcoin_qt_clean: FORCE bitcoin_qt : qt/bitcoin-qt$(EXEEXT) APK_LIB_DIR = qt/android/libs/$(ANDROID_ARCH) -QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*\.tar.xz") +QT_BASE_VERSION = $(lastword $(shell $(MOC) --version)) +QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*$(QT_BASE_VERSION)\.tar.xz") QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*') bitcoin_qt_apk: FORCE |