commit becb3ffccdecff83047285ebea20e5b85b2d65b1
author Tom Hughes <tomhughes@chromium.org> Tue Jan 09 16:21:53 2024 -0800
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 23 21:55:49 2024 +0000
tree 99785ccfa00b9583f09e29cc1c98c60f27825317
parent 81138bc861023edda4816e1a89398f32c3b68e23

Fix threads detection for CROS_EC/CROS_ZEPHYR

The CROS_EC and CROS_ZEPHYR platforms currently have threads disabled,
so we should not attempt to search for (or link) a threads library.

BUG=b/273639386

Change-Id: I094a989680160f9ecefbdb4cb3e94c4825a651e3
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65568
Reviewed-by: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>

crypto/CMakeLists.txt

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 6dd5f23..94327cc 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -342,7 +342,11 @@
   target_link_libraries(crypto ws2_32)
 endif()
 
-if(NOT ANDROID)
+# CMAKE_SYSTEM_NAME is "Generic" for embedded OSes:
+# https://cmake.org/cmake/help/book/mastering-cmake/chapter/Cross%20Compiling%20With%20CMake.html#toolchain-files
+#
+# For now we assume embedded OSes do not have threads.
+if(NOT (ANDROID OR CMAKE_SYSTEM_NAME STREQUAL "Generic"))
   find_package(Threads REQUIRED)
   target_link_libraries(crypto Threads::Threads)
 endif()