diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-03 16:11:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-03 16:11:58 (GMT) |
| commit | 957a117c705766d5d4d2d6c807217fe9d154cdff (patch) | |
| tree | 5bffa910e35b950f868202f8da2a96427f3c0b3e /Modules/Compiler | |
| parent | a88efbc9cfad2d69e1f1e8875383c4e9c1f39849 (diff) | |
| parent | 005e2cdfb05d92e1b24df2d35ea10ac557b3d831 (diff) | |
| download | CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.zip CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.tar.gz CMake-957a117c705766d5d4d2d6c807217fe9d154cdff.tar.bz2 | |
Merge topic 'android-r22'
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index 5862521..9f93d41 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -77,7 +77,7 @@ else() set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto") endif() - if(ANDROID) + if(ANDROID AND NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL "22") # https://github.com/android-ndk/ndk/issues/242 set(CMAKE_${lang}_LINK_OPTIONS_IPO "-fuse-ld=gold") endif() |