diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2015-11-08 16:50:50 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-08 09:46:18 -0800 |
| commit | 3c2179fea91fc28a8a7724a4d943fdc24d4502b8 (patch) | |
| tree | 262fb9da9549f3f97ff7dc6d7ff67e47c751ee2b /packaging | |
| parent | bc1473b1a05c2bd1dc51ebc49ccc68931c696b03 (diff) | |
| download | subsurface-3c2179fea91fc28a8a7724a4d943fdc24d4502b8.tar.gz | |
Android: ask which pkg-config to use
Since pkg-config is installed in different places on linux and mac,
let's ask where it is.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index ba724cd85..c3efa5bf1 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -283,9 +283,10 @@ else ANT=/usr/bin/ant FTDI=ON fi +PKGCONF=$(which pkg-config) cmake $MOBILE_CMAKE \ -DQT_ANDROID_ANT=${ANT} \ - -DPKG_CONFIG_EXECUTABLE=/usr/bin/pkg-config \ + -DPKG_CONFIG_EXECUTABLE=${PKGCONF} \ -DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \ -DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \ -DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \ |