diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-10-21 06:29:25 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:31:10 +0300 |
| commit | ae5b9b82c8629303c4427b4147db9dcf881c3aac (patch) | |
| tree | a123453e05cc1511bc1d322e42585b31854e44ec /tools/mkspecs | |
| parent | 40993f19364e8404d9c47de9731c61241b878047 (diff) | |
[android] Switched to clang 3.5
Diffstat (limited to 'tools/mkspecs')
| -rw-r--r-- | tools/mkspecs/android-clang/qmake.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index 7a6e98c7f6..368d63c1af 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -14,11 +14,12 @@ ANDROID_PLATFORM = $$(NDK_PLATFORM) isEmpty( ANDROID_PLATFORM ): ANDROID_PLATFORM = android-5 GCC_VERSION = 4.8 +CLANG_VERSION = 3.5 MAKEFILE_GENERATOR = UNIX -QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-3.4/prebuilt/$$(NDK_HOST)/bin/clang +QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang QMAKE_CC = $$QMAKE_COMPILER -QMAKE_CXX = $$(NDK_ROOT)/toolchains/llvm-3.4/prebuilt/$$(NDK_HOST)/bin/clang++ +QMAKE_CXX = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang++ QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC QMAKE_LINK = $$QMAKE_CXX @@ -30,7 +31,7 @@ QMAKE_CFLAGS_DEBUG *= -O0 -g -DDEBUG -D_DEBUG QMAKE_CXXFLAGS_DEBUG *= $$QMAKE_CFLAGS_DEBUG BASE_CXX_INCLUDE_PATH = $$(NDK_ROOT)/sources/cxx-stl/llvm-libc++ -BASE_GNUSTL_INCLUDE_PATH = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8 +BASE_GNUSTL_INCLUDE_PATH = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$$GCC_VERSION # Customizations for each arch contains(ANDROID_TARGET_ABI, x86) { |