From 4ae62648f305013e6657811b3eb876672e49d69f Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Tue, 19 May 2015 14:05:39 +0300 Subject: [PATCH] [android] Reverted back to clang 3.5 as normalize_unicode compiles too long in release mode with -O3 --- android/jni/Application.mk | 4 +++- tools/mkspecs/android-clang/qmake.conf | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index f78308ac36..0a74ce5e2f 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,4 +1,6 @@ -NDK_TOOLCHAIN_VERSION := clang3.6 +# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation. +# TODO: Replace normalize_unicode.cpp with equal by performance implementation (ask YuraRa about it). +NDK_TOOLCHAIN_VERSION := clang3.5 APP_PLATFORM := android-9 APP_STL := c++_static diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index ebc806ed07..0adc81f316 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -12,7 +12,9 @@ isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a ANDROID_PLATFORM = android-9 GCC_VERSION = 4.8 -CLANG_VERSION = 3.6 +# We can't use clang3.6 for now because it hangs at base/normalize_unicode.cpp compilation. +# TODO: Replace normalize_unicode.cpp with equal by performance implementation (ask YuraRa about it). +CLANG_VERSION = 3.5 MAKEFILE_GENERATOR = UNIX QMAKE_COMPILER = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang