| commit | 61266e464b9b509a8a0943b9cc826c97c31e04e7 | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@google.com> | Sun Jan 29 15:53:30 2023 -0500 |
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Feb 06 21:40:20 2023 +0000 |
| tree | 96944418b4997c8ae53f744aaf13c4f89b9caa8a | |
| parent | 8bc06cf491243eb95afebc80020c958a16e269a7 [diff] [blame] |
Limit the CMake -isysroot assembly workaround to older CMake It was fixed in CMake 3.19 with https://gitlab.kitware.com/cmake/cmake/-/issues/20771 Change-Id: Ia76ab6690e233bc650e11a79db381c00f21c83a1 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/56568 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/util/generate_build_files.py b/util/generate_build_files.py index ca173c8..c221f04 100644 --- a/util/generate_build_files.py +++ b/util/generate_build_files.py
@@ -457,8 +457,9 @@ else() enable_language(ASM) set(OPENSSL_ASM TRUE) - # CMake does not add -isysroot and -arch flags to assembly. - if(APPLE) + # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/20771 in older + # CMake versions. + if(APPLE AND CMAKE_VERSION VERSION_LESS 3.19) if(CMAKE_OSX_SYSROOT) set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -isysroot \"${CMAKE_OSX_SYSROOT}\"") endif()