Skip to content

Remove fix for s2n-tls on macOS x64 #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sfod wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Remove fix for s2n-tls on macOS x64 #996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f6b18
Check s2n-tls fix
sfodagain Jun 17, 2026
229ce13
Reverse s2n-tls
sfodagain Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,7 @@ if (BUILD_DEPS)
)

set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N")
# On Intel Macs, Homebrew installs to /usr/local which is in the default header search path.
# Without this, s2n's libcrypto detection picks up Homebrew's OpenSSL instead of bundled aws-lc.
# ARM Macs use /opt/homebrew (not in default search paths) so they don't need this.
if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED ${CMAKE_NO_SYSTEM_FROM_IMPORTED})
set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
endif()
add_subdirectory(crt/s2n)
if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(CMAKE_NO_SYSTEM_FROM_IMPORTED ${_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED})
unset(_AWS_CRT_PREV_NO_SYSTEM_FROM_IMPORTED)
endif()
endif()
add_subdirectory(crt/aws-c-sdkutils)
add_subdirectory(crt/aws-c-io)
Expand Down
Loading