This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 6fe1462fc67 [fix](third-party) Fix the build of aws-sdk-cpp (#47007)
6fe1462fc67 is described below
commit 6fe1462fc676addad79021ec5b7d2665a752768b
Author: Adonis Ling <[email protected]>
AuthorDate: Wed Jan 15 12:41:13 2025 +0800
[fix](third-party) Fix the build of aws-sdk-cpp (#47007)
---
.github/workflows/build-thirdparty.yml | 2 --
thirdparty/build-thirdparty.sh | 9 +++------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build-thirdparty.yml
b/.github/workflows/build-thirdparty.yml
index dd420474204..f3cb4f299d0 100644
--- 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
index 44bef0199aa..7fa82ae32ca 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -1250,19 +1250,16 @@ 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"
+ EXTRA_CFLAGS='-DCMAKE_C_FLAGS="-DTARGET_OS_OSX=1"'
else
- USE_LLVM_16=''
+ EXTRA_CFLAGS=''
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"
${EXTRA_CFLAGS:+${EXTRA_CFLAGS}} -DCMAKE_CXX_FLAGS="-Wno-nonnull
-Wno-deprecated-declarations" -DCPP_STANDARD=17
cd "${BUILD_DIR}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
