prebuild s2n (#665)

awslabs · Oct 18, 2024 · 29d3290 · 29d3290
1 parent 188cff7
commit 29d3290
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,7 @@ jobs:
   linux-compat:
     runs-on: ubuntu-22.04 # latest
     strategy:
+      fail-fast: false
       matrix:
         image:
           - manylinux2014-x64

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,8 +83,8 @@ if(BUILD_DEPS)
     add_subdirectory(crt/aws-c-common)
 
     if(UNIX AND NOT APPLE AND NOT BYO_CRYPTO)
+        include(AwsPrebuildDependency)
         if(NOT USE_OPENSSL)
-            include(AwsPrebuildDependency)
 
             set(AWSLC_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
@@ -104,7 +104,7 @@ if(BUILD_DEPS)
             endif()
 
             # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
-            prebuild_dependency(
+            aws_prebuild_dependency(
                 DEPENDENCY_NAME AWSLC
                 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc
                 CMAKE_ARGUMENTS
@@ -116,8 +116,14 @@ if(BUILD_DEPS)
             )
         endif()
 
-        set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "Disable warnings-as-errors when building S2N")
-        add_subdirectory(crt/s2n)
+        # prebuild s2n-tls.
+        aws_prebuild_dependency(
+            DEPENDENCY_NAME S2N
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/s2n
+            CMAKE_ARGUMENTS
+                -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+                -DBUILD_TESTING=OFF
+        )
     endif()
 
     add_subdirectory(crt/aws-c-sdkutils)

diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n