diff options
author | Brad King <brad.king@kitware.com> | 2019-06-19 12:20:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-06-19 12:20:35 (GMT) |
commit | 00ad0b9d127fb0587443c6346aacb72a5c96f234 (patch) | |
tree | a3132d555a89280a7c8905042268597c792dbd5f /Modules/Platform | |
parent | 1ca4be5d90b47894f6742d390796ec3b08001906 (diff) | |
parent | 9e99a95c7db5be8c6b979b0170ab4cf78bb32307 (diff) | |
download | CMake-00ad0b9d127fb0587443c6346aacb72a5c96f234.zip CMake-00ad0b9d127fb0587443c6346aacb72a5c96f234.tar.gz CMake-00ad0b9d127fb0587443c6346aacb72a5c96f234.tar.bz2 |
Merge branch 'android-pie-cmp0083' into release-3.15
Merge-request: !3459
Diffstat (limited to 'Modules/Platform')
-rw-r--r-- | Modules/Platform/Android/abi-common.cmake | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Modules/Platform/Android/abi-common.cmake b/Modules/Platform/Android/abi-common.cmake index a0b47f4..6bce3c7 100644 --- a/Modules/Platform/Android/abi-common.cmake +++ b/Modules/Platform/Android/abi-common.cmake @@ -12,6 +12,26 @@ if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() +cmake_policy(GET CMP0083 _CMP0083) +if(_CMP0083 STREQUAL NEW) + # PIE Flags are managed by compiler configuration files + if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 16) + # ensure PIE flags are passed to the linker + set(CMAKE_C_LINK_PIE_SUPPORTED YES CACHE INTERNAL "PIE (C)") + set(CMAKE_CXX_LINK_PIE_SUPPORTED YES CACHE INTERNAL "PIE (CXX)") + if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 21) + # no PIE executable are no longer supported + set(CMAKE_C_LINK_NO_PIE_SUPPORTED NO CACHE INTERNAL "NO_PIE (C)") + set(CMAKE_CXX_LINK_NO_PIE_SUPPORTED NO CACHE INTERNAL "NO_PIE (CXX)") + endif() + endif() +else() + if(CMAKE_POSITION_INDEPENDENT_CODE) + string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -fPIE -pie") + endif() +endif() +unset(_CMP0083) + string(APPEND _ANDROID_ABI_INIT_EXE_LDFLAGS " -Wl,--gc-sections") if(NOT _ANDROID_ABI_INIT_EXE_LDFLAGS_NO_nocopyreloc) |