diff options
| author | David Benjamin <davidben@google.com> | 2024-01-23 15:22:45 -0500 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-01-26 18:55:00 +0000 |
| commit | 8378dad8af30bc825518ef38098c4a50cfa99728 (patch) | |
| tree | 2863a153acd7818b85e0b223c5899964c875b873 /CMakeLists.txt | |
| parent | 4a8653a48685748b795db51d40e80088ad86dd2a (diff) | |
| download | boringssl-8378dad8af30bc825518ef38098c4a50cfa99728.zip boringssl-8378dad8af30bc825518ef38098c4a50cfa99728.tar.gz boringssl-8378dad8af30bc825518ef38098c4a50cfa99728.tar.bz2 | |
Remove remnants of the old Android CMake toolchain
The PATH-related workarounds for the old third-party Android toolchain
don't seem to apply to the official NDK one, so just remove them. The
official one does define the ANDROID variable, but only in an
"android-legacy.toolchain.cmake". I think the standard way to do this is
CMAKE_SYSTEM_NAME so switch to that.
Change-Id: I3f3fa69d482893c333ae06f54ac39434c3c6a56c
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65670
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c7926d..0639217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,15 +43,7 @@ function(install_if_enabled) endif() endfunction() -if(ANDROID) - # Android-NDK CMake files reconfigure the path and so Perl won't be found. - # However, ninja will still find them in $PATH if we just name them. - if(NOT PERL_EXECUTABLE) - set(PERL_EXECUTABLE "perl") - endif() -else() - find_package(Perl REQUIRED) -endif() +find_package(Perl REQUIRED) if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_CROSSCOMPILING) find_package(PkgConfig QUIET) |