diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-02-19 09:51:22 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-02-19 09:51:22 +0000 |
| commit | 84d5a235fdd09b7ed5271203a0b4ac9ab657edab (patch) | |
| tree | b31ed7e9ff101eaa17b265855184b93bdb15d7a7 /cmake | |
| parent | 70416f80a7147ccecf1ae980b01c9064811c67a8 (diff) | |
| download | llvm-84d5a235fdd09b7ed5271203a0b4ac9ab657edab.tar.gz llvm-84d5a235fdd09b7ed5271203a0b4ac9ab657edab.tar.bz2 llvm-84d5a235fdd09b7ed5271203a0b4ac9ab657edab.tar.xz | |
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
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/platforms/Android.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/platforms/Android.cmake b/cmake/platforms/Android.cmake index 49a435f67c..2a6f5a5e45 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) + |