diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-03 16:11:52 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-03 11:11:58 -0500 |
| commit | ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40 (patch) | |
| tree | 117ddfaecefcbe3b5e14f283a6e6e642891a2fe3 /Modules/Compiler/Clang.cmake | |
| parent | 97944e01b0a632cfeffaa06d211f7425f342d926 (diff) | |
| parent | 005e2cdfb05d92e1b24df2d35ea10ac557b3d831 (diff) | |
| download | cmake-ef3d1ebda874a338a8d78c2a31d3d94c4ba4ea40.tar.gz | |
Merge topic 'android-r22' into release-3.20
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/Clang.cmake')
| -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 5862521cfc..9f93d4188b 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() |