From d7b1aa8b90eb75956d717b8258cdb9367dde0848 Mon Sep 17 00:00:00 2001 From: naman1996 Date: Wed, 21 Oct 2020 16:08:44 +0530 Subject: [PATCH 1/2] Add llvm@9 during brew install for macOS --- cpp/CMakeLists.txt | 2 +- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 0720f567a4e..5b200c32e60 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -109,7 +109,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" "9" "8" "7") +set(ARROW_LLVM_VERSIONS "9" "8" "7") list(GET ARROW_LLVM_VERSIONS 0 ARROW_LLVM_VERSION_PRIMARY) string(REGEX REPLACE "^([0-9]+)(\\..+)?" "\\1" ARROW_LLVM_VERSION_PRIMARY_MAJOR diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 8a0576dcd62..7592a585efc 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -40,7 +40,7 @@ before_script: - export TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR/arrow - git -C arrow submodule update --init --recursive - brew update - - brew install bison flex llvm + - brew install bison flex llvm@9 - brew tap adoptopenjdk/openjdk - brew cask install adoptopenjdk8 - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home From c217cd102e3282b33a2444e2f24523d6153a4ac8 Mon Sep 17 00:00:00 2001 From: naman1996 Date: Wed, 21 Oct 2020 20:30:34 +0530 Subject: [PATCH 2/2] Adding llvm@9 to brewfile --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 7de6c7deabe..b63bc882e15 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -25,7 +25,7 @@ brew "flatbuffers" brew "git" brew "glog" brew "grpc" -brew "llvm" +brew "llvm@9" brew "llvm@8" brew "lz4" brew "minio"