Android: Set default to gcc 4.8
The 4.7 version of the toolchain in the NDK has been obsoleted by the introduction of version 4.8. The default can still be overridden if necessary. Change-Id: I042ded92e50dc5ebc4d54ffccc2e6856fc3edba0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
48f332f802
commit
9863188431
2
configure
vendored
2
configure
vendored
@ -1068,7 +1068,7 @@ CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT
|
|||||||
CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
|
CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT
|
||||||
CFG_DEFAULT_ANDROID_PLATFORM=android-9
|
CFG_DEFAULT_ANDROID_PLATFORM=android-9
|
||||||
CFG_DEFAULT_ANDROID_TARGET_ARCH=armeabi-v7a
|
CFG_DEFAULT_ANDROID_TARGET_ARCH=armeabi-v7a
|
||||||
CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.7
|
CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.8
|
||||||
CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST
|
CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST
|
||||||
|
|
||||||
if [ -d "$relpath/src/plugins/sqldrivers" ]; then
|
if [ -d "$relpath/src/plugins/sqldrivers" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user