summaryrefslogtreecommitdiff
path: root/Toolchain
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-05-04 19:17:54 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-05-04 19:17:54 +0000
commit096bba9eb12e183dd760f050a1def04ff4461acd (patch)
tree55e2055dd9cd5942aa18c913f90b37b520176bae /Toolchain
parentced84c2d959c1efe8d6920a5180fd3108b0fdf62 (diff)
downloadnavit-096bba9eb12e183dd760f050a1def04ff4461acd.tar.gz
Fix:Android:Fix build with android NDK >= 6b
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5073 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'Toolchain')
-rwxr-xr-xToolchain/arm-eabi.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake
index fb9413c06..9f5473b4b 100755
--- a/Toolchain/arm-eabi.cmake
+++ b/Toolchain/arm-eabi.cmake
@@ -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}")