[fix](third-party) Fix the build of aws-sdk-cpp

apache · Jan 15, 2025 · 88811f2 · 88811f2
1 parent 594040d
commit 88811f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/build-thirdparty.yml b/.github/workflows/build-thirdparty.yml
@@ -165,7 +165,6 @@ jobs:
             'maven'
             'node'
             'llvm@15'
-            'llvm@16'
           )
 
           brew install "${packages[@]}" || true
@@ -217,7 +216,6 @@ jobs:
             'maven'
             'node'
             'llvm@15'
-            'llvm@16'
           )
 
           brew install "${packages[@]}" || true

diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
@@ -1249,20 +1249,11 @@ build_aws_sdk() {
 
     rm -rf "${BUILD_DIR}"
 
-    if [[ "${KERNEL}" == 'Darwin' ]]; then
-        # Use llvm@16 to build aws-c-cal instead of llvm@15
-        USE_LLVM_16="-DCMAKE_C_COMPILER=$(brew --prefix)/opt/llvm@16/bin/clang"
-    else
-        USE_LLVM_16=''
-    fi
-
     # -Wno-nonnull gcc-11
     "${CMAKE_CMD}" -G "${GENERATOR}" -B"${BUILD_DIR}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
         -DCMAKE_PREFIX_PATH="${TP_INSTALL_DIR}" -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF \
         -DCURL_LIBRARY_RELEASE="${TP_INSTALL_DIR}/lib/libcurl.a" -DZLIB_LIBRARY_RELEASE="${TP_INSTALL_DIR}/lib/libz.a" \
-        -DBUILD_ONLY="core;s3;s3-crt;transfer" \
-        ${USE_LLVM_16:+${USE_LLVM_16}} \
-        -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-deprecated-declarations" -DCPP_STANDARD=17
+        -DBUILD_ONLY="core;s3;s3-crt;transfer" -DCMAKE_C_FLAGS='-DTARGET_OS_OSX=1' -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-deprecated-declarations" -DCPP_STANDARD=17
 
     cd "${BUILD_DIR}"