mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 06:29:07 +08:00
f519430b0f
* Add curl try_compile parameters Don't set compiler when compiling for iOS * Update OpenSSL and AWS SDK for C++ port versions * [vcpkg baseline][marble] Disable find I18n * update version record * Fix AWS C Common build for WASM32 * Fix OpenSSL build for WASM32 * Update AWS C Common and OpenSSL versions * Update versions/a-/aws-sdk-cpp.json * Update versions/o-/openssl.json * Fix port-versions after merging master branch * Fix port-versions after merging master branch * Update versions/o-/openssl.json * Update versions/a-/aws-sdk-cpp.json * Update versions/o-/openssl.json * Fix merge conflicts * Fix merge conflicts * Update ports/aws-c-common/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update versions/a-/aws-c-common.json * Update versions/o-/openssl.json * Update versions/o-/openssl.json * Update versions/o-/openssl.json * Update ports/openssl/CONTROL * Merge master branch and resolve merge conflicts * Disable -moutline-atomics in Android also * Revert line ending change * Fix version info Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
19 lines
845 B
Diff
19 lines
845 B
Diff
diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
|
|
--- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334)
|
|
+++ b/cmake/AwsCFlags.cmake (date 1618758078727)
|
|
@@ -70,9 +70,11 @@
|
|
|
|
# -moutline-atomics generates code for both older load/store exclusive atomics and also
|
|
# Arm's Large System Extensions (LSE) which scale substantially better on large core count systems
|
|
- check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
|
|
- if (HAS_MOUTLINE_ATOMICS)
|
|
- list(APPEND AWS_C_FLAGS -moutline-atomics)
|
|
+ if(NOT EMSCRIPTEN AND NOT ANDROID)
|
|
+ check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS)
|
|
+ if (HAS_MOUTLINE_ATOMICS)
|
|
+ list(APPEND AWS_C_FLAGS -moutline-atomics)
|
|
+ endif()
|
|
endif()
|
|
endif()
|
|
|