-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
abseil: fix build on macOS when using LLVM clang (#26107)
--------- Co-authored-by: PerseoGI <[email protected]>
- Loading branch information
Showing
2 changed files
with
23 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
recipes/abseil/all/patches/0006-backport-arm-compilation-fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/absl/copts/AbseilConfigureCopts.cmake b/absl/copts/AbseilConfigureCopts.cmake | ||
index 73435e9..f95ea36 100644 | ||
--- a/absl/copts/AbseilConfigureCopts.cmake | ||
+++ b/absl/copts/AbseilConfigureCopts.cmake | ||
@@ -42,7 +42,7 @@ if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES [[Clang]]) | ||
string(TOUPPER "${_arch}" _arch_uppercase) | ||
string(REPLACE "X86_64" "X64" _arch_uppercase ${_arch_uppercase}) | ||
foreach(_flag IN LISTS ABSL_RANDOM_HWAES_${_arch_uppercase}_FLAGS) | ||
- list(APPEND ABSL_RANDOM_RANDEN_COPTS "-Xarch_${_arch}" "${_flag}") | ||
+ list(APPEND ABSL_RANDOM_RANDEN_COPTS "SHELL:-Xarch_${_arch} ${_flag}") | ||
endforeach() | ||
endforeach() | ||
# If a compiler happens to deal with an argument for a currently unused |