From 84d5a235fdd09b7ed5271203a0b4ac9ab657edab Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 19 Feb 2014 09:51:22 +0000 Subject: [PATCH] Build PIE binaries when cross-compiling to Android. This change also removes CMAKE_LINK_FLAGS setting that seems to be ignored by cmake. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201654 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/platforms/Android.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/platforms/Android.cmake b/cmake/platforms/Android.cmake index 49a435f67c1..2a6f5a5e45b 100644 --- a/cmake/platforms/Android.cmake +++ b/cmake/platforms/Android.cmake @@ -25,4 +25,5 @@ SET(ANDROID "1" CACHE STRING "ANDROID" FORCE) SET(ANDROID_COMMON_FLAGS "-target arm-linux-androideabi --sysroot=${LLVM_ANDROID_TOOLCHAIN_DIR}/sysroot -B${LLVM_ANDROID_TOOLCHAIN_DIR}") SET(CMAKE_C_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_cflags" FORCE) SET(CMAKE_CXX_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_cxxflags" FORCE) -SET(CMAKE_LINK_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_linkflags" FORCE) +SET(CMAKE_EXE_LINKER_FLAGS "-pie" CACHE STRING "toolchain_exelinkflags" FORCE) +