Skip to content

Commit

Permalink
Add missing libLLVMSupport.a dependency
Browse files Browse the repository at this point in the history
Change-Id: I6d13457a689406ed9a98840463a157bc2be7430d
  • Loading branch information
wesm committed Feb 6, 2019
1 parent 4448243 commit 034b17d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ matrix:
- ARROW_TRAVIS_GANDIVA=1
- ARROW_TRAVIS_USE_SYSTEM_JAVA=1
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
- CC="clang-7"
- CXX="clang++-7"
before_script:
- if [ $ARROW_CI_CPP_AFFECTED != "1" ]; then exit; fi
- export CC="clang-7"
- export CXX="clang++-7"
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
# If either C++ or Python changed, we must install the C++ libraries
Expand Down Expand Up @@ -262,10 +262,10 @@ matrix:
env:
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_PLASMA_JAVA_CLIENT=1
- CC="clang-7"
- CXX="clang++-7"
before_script:
- if [ $ARROW_CI_INTEGRATION_AFFECTED != "1" ]; then exit; fi
- export CC="clang-7"
- export CXX="clang++-7"
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
- nvm install 11.6
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake_modules/FindLLVM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")

# Find the libraries that correspond to the LLVM components
llvm_map_components_to_libnames(LLVM_LIBS core mcjit native ipo bitreader target linker analysis debuginfodwarf)
llvm_map_components_to_libnames(LLVM_LIBS support core mcjit native ipo bitreader irreader target linker analysis debuginfodwarf)

find_program(LLVM_LINK_EXECUTABLE llvm-link
HINTS ${LLVM_TOOLS_BINARY_DIR})
Expand Down

0 comments on commit 034b17d

Please sign in to comment.