This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 7d587b9 ARROW-8157: [C++][Gandiva] Support building with LLVM 9
7d587b9 is described below
commit 7d587b96550a0d12e54e06b55926f4bc22d1463d
Author: Sutou Kouhei <[email protected]>
AuthorDate: Sun Jun 7 11:33:20 2020 -0500
ARROW-8157: [C++][Gandiva] Support building with LLVM 9
LLVM 7 and 8 are still supported.
Closes #7280 from kou/cpp-llvm-9
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Wes McKinney <[email protected]>
---
ci/docker/debian-10-cpp.dockerfile | 1 -
cpp/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ci/docker/debian-10-cpp.dockerfile
b/ci/docker/debian-10-cpp.dockerfile
index 9a7935d..955e7ae 100644
--- a/ci/docker/debian-10-cpp.dockerfile
+++ b/ci/docker/debian-10-cpp.dockerfile
@@ -37,7 +37,6 @@ RUN apt-get update -y -q && \
apt-get update -y -q && \
apt-get install -y -q --no-install-recommends \
autoconf \
- ca-certificates \
ccache \
clang-${llvm} \
cmake \
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index b4f94c3..fc1c4e8 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -92,7 +92,7 @@ set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
set(ARROW_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}")
-set(ARROW_LLVM_VERSIONS "10" "8" "7")
+set(ARROW_LLVM_VERSIONS "10" "9" "8" "7")
list(GET ARROW_LLVM_VERSIONS 0 ARROW_LLVM_VERSION_PRIMARY)
string(REGEX
REPLACE "^([0-9]+)(\\..+)?" "\\1" ARROW_LLVM_VERSION_PRIMARY_MAJOR
