From 4e132103d6dc0bb411f233951a4496c151e55259 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Fri, 18 Oct 2024 14:56:31 -0700
Subject: [PATCH] Prebuild s2n (#602)

---
 crt/CMakeLists.txt | 12 +++++++++---
 crt/aws-c-common   |  2 +-
 crt/aws-c-io       |  2 +-
 crt/aws-c-mqtt     |  2 +-
 crt/aws-lc         |  2 +-
 crt/s2n            |  2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/crt/CMakeLists.txt b/crt/CMakeLists.txt
index 6dc50883..875068d3 100644
--- a/crt/CMakeLists.txt
+++ b/crt/CMakeLists.txt
@@ -30,9 +30,9 @@ include(CTest)
 # (On Windows and Apple we use the default OS libraries)
 if(UNIX AND NOT APPLE)
     option(USE_OPENSSL "Set this if you want to use your system's OpenSSL compatible libcrypto" OFF)
+    include(AwsPrebuildDependency)
 
     if(NOT USE_OPENSSL)
-        include(AwsPrebuildDependency)
 
         set(AWSLC_CMAKE_ARGUMENTS
             -DDISABLE_GO=ON  # Build without using Go, we don't want the extra dependency
@@ -54,8 +54,14 @@ if(UNIX AND NOT APPLE)
         )
     endif()
 
-    set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF CACHE BOOL "")
-    add_subdirectory(s2n)
+    # prebuild s2n-tls.
+    aws_prebuild_dependency(
+        DEPENDENCY_NAME S2N
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n
+        CMAKE_ARGUMENTS
+            -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+            -DBUILD_TESTING=OFF
+    )
 endif()
 
 add_subdirectory(aws-c-common)
diff --git a/crt/aws-c-common b/crt/aws-c-common
index b9959f59..f8c5d8e5 160000
--- a/crt/aws-c-common
+++ b/crt/aws-c-common
@@ -1 +1 @@
-Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c
+Subproject commit f8c5d8e5134fa97955351a44f16b84f96de24045
diff --git a/crt/aws-c-io b/crt/aws-c-io
index c345d772..dc41ddc4 160000
--- a/crt/aws-c-io
+++ b/crt/aws-c-io
@@ -1 +1 @@
-Subproject commit c345d77274db83c0c2e30331814093e7c84c45e2
+Subproject commit dc41ddc498c10ebbf69aba7775afa36c8c1910bd
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
index c43232c1..77d6f00e 160000
--- a/crt/aws-c-mqtt
+++ b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit c43232c1bc378344bb7245d7fcb167410f3fe931
+Subproject commit 77d6f00e89b10e3263d8a17576ec8e91c45b4606
diff --git a/crt/aws-lc b/crt/aws-lc
index d3a598c1..8b2ebfcf 160000
--- a/crt/aws-lc
+++ b/crt/aws-lc
@@ -1 +1 @@
-Subproject commit d3a598c1b419d49b5b08f0677add4581572e2edc
+Subproject commit 8b2ebfcf3fc8b0656f1f4161166484a70238aeaa
diff --git a/crt/s2n b/crt/s2n
index 08d413a0..ffe0bf42 160000
--- a/crt/s2n
+++ b/crt/s2n
@@ -1 +1 @@
-Subproject commit 08d413a0b9b3226e775a38f04e3cf02230cc97c4
+Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb