Fix:Android:Fix build with android NDK >= 6b
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Fri, 4 May 2012 19:17:54 +0000 (19:17 +0000)
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Fri, 4 May 2012 19:17:54 +0000 (19:17 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5073 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/Toolchain/arm-eabi.cmake

index fb9413c..9f5473b 100755 (executable)
@@ -16,7 +16,7 @@ set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod
 set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm")
 set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR})
 
-set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib ${EXTRA_COMPILER_FLAGS}")
+set(CMAKE_REQUIRED_FLAGS "-ldl --sysroot=${NDK_ARCH_DIR} ${EXTRA_COMPILER_FLAGS}")
 set(CMAKE_REQUIRED_INCLUDES "${NDK_ARCH_DIR}/usr/include")
 
 set(NAVIT_COMPILE_FLAGS "-I${NDK_ARCH_DIR}/usr/include -g -D_GNU_SOURCE -DANDROID -fno-short-enums ${CMAKE_REQUIRED_FLAGS}")