You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/04/11 05:03:21 UTC
[incubator-doris] branch master updated: Revert "[Thirdparty]Add llvm for codegen (#8938)" (#8948)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0b1b3e225d Revert "[Thirdparty]Add llvm for codegen (#8938)" (#8948)
0b1b3e225d is described below
commit 0b1b3e225d8882db367906f9e8e7cda785cfe6ac
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Mon Apr 11 13:03:16 2022 +0800
Revert "[Thirdparty]Add llvm for codegen (#8938)" (#8948)
This reverts commit 32133621c69a2d7544549c5ea54ed6d9de60415e.
Reverts #8938
The LLVM requires GLIBC_2.15. I decided to create a branch for the llvm feature first.
And once we resolve the low version glibc issue, it will be merged back to master.
---
thirdparty/build-thirdparty.sh | 24 ------------------------
thirdparty/vars.sh | 9 +--------
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 036029ecc7..3b7a108c28 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -956,30 +956,6 @@ build_simdjson() {
cp -r $TP_SOURCE_DIR/$SIMDJSON_SOURCE/include/* $TP_INCLUDE_DIR/
}
-# llvm
-build_llvm() {
- check_if_source_exist $LLVM_SOURCE
- cd $TP_SOURCE_DIR/$LLVM_SOURCE
-
- mkdir -p $BUILD_DIR && cd $BUILD_DIR
- CXX_FLAGS="-O3" \
- C_FLAGS="-O3" \
- $CMAKE_CMD -DLLVM_INCLUDE_BENCHMARKS=OFF \
- -DLLVM_TARGETS_TO_BUILD="X86;AArch64" \
- -DLLVM_ENABLE_TERMINFO=OFF \
- -DLLVM_INCLUDE_TOOLS=OFF \
- -DLLVM_INCLUDE_UTILS=OFF \
- -DLLVM_INCLUDE_TESTS=OFF \
- -DLLVM_USE_FOLDERS=OFF \
- -DLLVM_ENABLE_LIBEDIT=OFF \
- -DLLVM_ENABLE_LIBPFM=OFF \
- -DLLVM_ENABLE_RTTI=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR ..
- make -j $PARALLEL && make install
-}
-
-build_llvm
build_libunixodbc
build_openssl
build_libevent
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 44ee7c4b90..65dbc0df23 100755
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -377,12 +377,6 @@ LIBBACKTRACE_NAME=libbacktrace-2446c66076480ce07a6bd868badcbceb3eeecc2e.zip
LIBBACKTRACE_SOURCE=libbacktrace-2446c66076480ce07a6bd868badcbceb3eeecc2e
LIBBACKTRACE_MD5SUM="6c79a8012870a24610c0d9c3621b23fe"
-# llvm
-LLVM_DOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/llvm-14.0.0.src.tar.xz"
-LLVM_NAME="llvm-14.0.0.src.tar.xz"
-LLVM_SOURCE="llvm-14.0.0.src"
-LLVM_MD5SUM="91ad90cc054593ce95230f4b2118c9d1"
-
# all thirdparties which need to be downloaded is set in array TP_ARCHIVES
export TP_ARCHIVES="LIBEVENT
OPENSSL
@@ -436,5 +430,4 @@ BENCHMARK
BREAKPAD
XSIMD
SIMDJSON
-LIBBACKTRACE
-LLVM"
+LIBBACKTRACE"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org