diff options
| author | Kim Grasman <kim.grasman@gmail.com> | 2019-09-30 20:56:53 +0200 |
|---|---|---|
| committer | Kim Gräsman <kim.grasman@gmail.com> | 2019-09-30 21:56:42 +0200 |
| commit | e3bf9ccfd47e1c3ce10a77815cc09b82408d3f68 (patch) | |
| tree | a812f46ebf0ca06d0544046f8a4270ce7156c190 | |
| parent | 2e4e36f4efde601f260f5300b686146a93441b5d (diff) | |
[travis] Add lldb-10 as a package dependency
LLVMConfig/LLVMExports.cmake exports lit-cpuid, but the actual binary is
shipped with the lldb package.
Install that package to avoid messy patching.
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f452f29..fab7800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ addons: - llvm-10-tools
- libclang-10-dev
- clang-10
+ # TODO: This is required for lit-cpuid, which is exported from
+ # LLVMConfig.cmake, but shipped with LLDB.
+ - lldb-10
before_install:
# Install a supported cmake version (>= 3.4.3)
@@ -36,11 +39,6 @@ before_install: - sudo sed -i -e '/clang-cpp/d' $ROOT_PATH/lib/cmake/clang/ClangTargets.cmake
- sudo sed -i -e '/IMPORTED_SONAME_RELWITHDEBINFO.*libclang-cpp\.so/,+1 d' $ROOT_PATH/lib/cmake/clang/ClangTargets-relwithdebinfo.cmake
- sudo sed -i -e '/clang-cpp/d' $ROOT_PATH/lib/cmake/clang/ClangTargets-relwithdebinfo.cmake
- - sudo sed -E -i -e 's/([A-Za-z0-9_-]+) lit-cpuid ([A-Za-z0-9_-]+)/\1 \2/' $ROOT_PATH/lib/cmake/llvm/LLVMExports.cmake
- - sudo sed -i -e '/lit-cpuid/d' $ROOT_PATH/lib/cmake/llvm/LLVMExports.cmake
- - sudo sed -i -e '/IMPORTED_LOCATION_RELWITHDEBINFO.*lit-cpuid/,+1 d' $ROOT_PATH/lib/cmake/llvm/LLVMExports-relwithdebinfo.cmake
- - sudo sed -i -e '/lit-cpuid/d' $ROOT_PATH/lib/cmake/llvm/LLVMExports-relwithdebinfo.cmake
- - sudo sed -E -i -e 's/([A-Za-z0-9_-]+);lit-cpuid;([A-Za-z0-9_-]+)/\1;\2/' $ROOT_PATH/lib/cmake/llvm/LLVMConfig.cmake
script:
# Build IWYU
|