Skip to content

removing llvm@10 test branch #8497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
naman1996 wants to merge 2 commits into from
Closed

removing llvm@10 test branch #8497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b1aa8
Add llvm@9 during brew install for macOS
Oct 21, 2020
c217cd1
Adding llvm@9 to brewfile
Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/Brewfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ brew "flatbuffers"
brew "git"
brew "glog"
brew "grpc"
brew "llvm"
brew "llvm@9"
brew "llvm@8"
brew "lz4"
brew "minio"
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/gandiva-jars/travis.osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down