diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
| commit | c1afa8b8238c25591ca80d068477aa7d4ce05fc8 (patch) | |
| tree | 284a9f8b319de5783ff83ad004a9e390cb60fd0d /absl/copts/AbseilConfigureCopts.cmake | |
| parent | 23778b53f420f54eebc195dd8430e79bda165e5b (diff) | |
| parent | 4447c7562e3bc702ade25105912dce503f0c4010 (diff) | |
| download | abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.gz abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.bz2 abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.zip | |
Merge new upstream LTS 20240722.0
Diffstat (limited to 'absl/copts/AbseilConfigureCopts.cmake')
| -rw-r--r-- | absl/copts/AbseilConfigureCopts.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/copts/AbseilConfigureCopts.cmake b/absl/copts/AbseilConfigureCopts.cmake index 3f737c81..a618199d 100644 --- a/absl/copts/AbseilConfigureCopts.cmake +++ b/absl/copts/AbseilConfigureCopts.cmake @@ -3,7 +3,7 @@ include(GENERATED_AbseilCopts) set(ABSL_DEFAULT_LINKOPTS "") -if (BUILD_SHARED_LIBS AND MSVC) +if (BUILD_SHARED_LIBS AND (MSVC OR ABSL_BUILD_MONOLITHIC_SHARED_LIBS)) set(ABSL_BUILD_DLL TRUE) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) else() @@ -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 |