Skip to content

Commit

Permalink
Build PIE binaries when cross-compiling to Android.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
eugenis committed Feb 19, 2014
1 parent 70416f8 commit 84d5a23
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cmake/platforms/Android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 84d5a23

Please sign in to comment.