Merge pull request #42730 from ClickHouse/build-libcxx-and-libcxxabi-from-llvm-project

Build libcxx and libcxxabi from llvm-project
This commit is contained in:
Robert Schulze 2022-11-30 18:23:48 +01:00 committed by GitHub
commit 3fc10d5fe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4 additions and 13 deletions

6
.gitmodules vendored
View File

@ -65,12 +65,6 @@
[submodule "contrib/libgsasl"]
path = contrib/libgsasl
url = https://github.com/ClickHouse/libgsasl.git
[submodule "contrib/libcxx"]
path = contrib/libcxx
url = https://github.com/ClickHouse/libcxx.git
[submodule "contrib/libcxxabi"]
path = contrib/libcxxabi
url = https://github.com/ClickHouse/libcxxabi.git
[submodule "contrib/snappy"]
path = contrib/snappy
url = https://github.com/ClickHouse/snappy.git

1
contrib/libcxx vendored

@ -1 +0,0 @@
Subproject commit 4db7f838afd3139eb3761694b04d31275df45d2d

View File

@ -1,6 +1,6 @@
include(CheckCXXCompilerFlag)
set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxx")
set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxx")
set(SRCS
"${LIBCXX_SOURCE_DIR}/src/algorithm.cpp"

1
contrib/libcxxabi vendored

@ -1 +0,0 @@
Subproject commit a736a6b3c6a7b8aae2ebad629ca21b2c55b4820e

View File

@ -1,4 +1,4 @@
set(LIBCXXABI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxxabi")
set(LIBCXXABI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/libcxxabi")
set(SRCS
"${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp"

@ -1 +1 @@
Subproject commit 3a39038345a400e7e767811b142a94355d511215
Subproject commit e61a81aa6fc529b469e2a54b7ce788606e138b5d

View File

@ -117,8 +117,7 @@ function clone_submodules
contrib/cctz
contrib/libcpuid
contrib/double-conversion
contrib/libcxx
contrib/libcxxabi
contrib/llvm-project
contrib/lz4
contrib/zstd
contrib/fastops