Merge branch 'main' into swift_error

.github/workflows/ci.yml

@@ -220,7 +220,7 @@ jobs:
           operating_system: freebsd
           version: '13.2'
           run: |
-            sudo pkg install -y python3 py39-urllib3 py39-pip cmake
+            sudo pkg install -y python3 devel/py-pip net/py-urllib3 cmake
             python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
             chmod a+x builder
             ./builder build -p ${{ env.PACKAGE_NAME }}

cmake/AwsSanitizers.cmake

@@ -11,13 +11,15 @@ set(SANITIZERS "address;undefined" CACHE STRING "List of sanitizers to build wit
 #  sanitizer: The sanitizer to check
 #  out_variable: The variable to assign the result to. Defaults to HAS_SANITIZER_${sanitizer}
 function(aws_check_sanitizer sanitizer)
-
-    if(NOT ${ARGN})
-        set(out_variable "${ARGN}")
-    else()
+    list(LENGTH ARGN extra_count)
+    if(${extra_count} EQUAL 0)
         set(out_variable HAS_SANITIZER_${sanitizer})
         # Sanitize the variable name to remove illegal characters
         string(MAKE_C_IDENTIFIER ${out_variable} out_variable)
+    elseif(${extra_count} EQUAL 1)
+        set(out_variable ${ARGN})
+    else()
+        message(FATAL_ERROR "Error: aws_check_sanitizer() called with multiple out variables")
     endif()
 
     if(ENABLE_SANITIZERS)