Skip to content

Commit cb7eba2

Browse files
committed
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).
1 parent 8600934 commit cb7eba2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Makefile.qt.include

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ bitcoin_qt_clean: FORCE
382382
bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
383383

384384
APK_LIB_DIR = qt/android/libs/$(ANDROID_ARCH)
385-
QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*\.tar.xz")
385+
QT_BASE_VERSION = $(lastword $(shell $(MOC) --version))
386+
QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*$(QT_BASE_VERSION)\.tar.xz")
386387
QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*')
387388

388389
bitcoin_qt_apk: FORCE

0 commit comments

Comments
 (0)