summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-02-19 09:51:22 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-02-19 09:51:22 +0000
commitec931ecf12007cb94e53b3cc27fb5f559186e40c (patch)
tree95f46be5850b2fb8f6541f5983cabf856ac38e6e
parentcaaaac8c30a298269f0badf6e07342ea240168c5 (diff)
downloadbcm5719-llvm-ec931ecf12007cb94e53b3cc27fb5f559186e40c.tar.gz
bcm5719-llvm-ec931ecf12007cb94e53b3cc27fb5f559186e40c.zip
Build PIE binaries when cross-compiling to Android.
This change also removes CMAKE_LINK_FLAGS setting that seems to be ignored by cmake. llvm-svn: 201654
-rw-r--r--llvm/cmake/platforms/Android.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/cmake/platforms/Android.cmake b/llvm/cmake/platforms/Android.cmake
index 49a435f67c1..2a6f5a5e45b 100644
--- a/llvm/cmake/platforms/Android.cmake
+++ b/llvm/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)
+
OpenPOWER on IntegriCloud