diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-26 12:48:35 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-26 14:17:07 -0400 |
| commit | 97bca2f9fab58fcf5bbcb29e1e7e86e37b5cc1e0 (patch) | |
| tree | 048fee25cd8797b3527994c504c5b8ce50e2ede2 /Tests/RunCMake/Android/ndk-mips-stdout.txt | |
| parent | 19f36c5fb2497703e4f071b3a9424a8d121ccef9 (diff) | |
| download | cmake-97bca2f9fab58fcf5bbcb29e1e7e86e37b5cc1e0.tar.gz | |
Android: Use unified toolchain in NDK r19+
The NDK build system now uses only a single toolchain in
<ndk>/toolchains/llvm/prebuilt/<host>
Its compilers are always `bin/{clang,clang++}` and its binutils are
always `bin/<triple>-*`. It is a standalone toolchain:
* The Anrdoid API level is specified at the end of `--target=`.
* The standard library may be specified via `-stdlib=`.
* No need to pass system includes or libraries explicitly.
* No need to pass `--sysroot` or `-gcc-toolchain`.
Teach CMake to recognize NDK versions that have a unified
toolchain with its own sysroot and use the above approach.
Fixes: #18739
Diffstat (limited to 'Tests/RunCMake/Android/ndk-mips-stdout.txt')
| -rw-r--r-- | Tests/RunCMake/Android/ndk-mips-stdout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/Android/ndk-mips-stdout.txt b/Tests/RunCMake/Android/ndk-mips-stdout.txt index c74468362a..8ce544dcce 100644 --- a/Tests/RunCMake/Android/ndk-mips-stdout.txt +++ b/Tests/RunCMake/Android/ndk-mips-stdout.txt @@ -1,2 +1,2 @@ -- Android: Targeting API '[0-9]+' with architecture 'mips', ABI 'mips', and processor 'mips' --- Android: Selected (Clang toolchain '[^']+' with )?GCC toolchain '[^']+' +-- Android: Selected (unified Clang toolchain|(Clang toolchain '[^']+' with )?GCC toolchain '[^']+') |