diff options
| author | bors <bors@rust-lang.org> | 2018-09-05 18:11:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-05 18:11:27 +0000 |
| commit | 780b0c7bbfacc56f59a729881b5c95cd2c61ff97 (patch) | |
| tree | b80dd88f48c00159836c53c6d7d965095b26c38d | |
| parent | d8af8b66d948ff394db1b3a50e2e4fbe02512239 (diff) | |
| parent | 7bb30ff0d923f27afd7ab98e338cc835c7b4cf52 (diff) | |
Auto merge of #53951 - tromey:restore-lldb-build, r=alexcrichton
Restore lldb build
commit 6c10142251 ("Update LLVM submodule") disabled the lldb build.
This patch updates the lldb and clang submodules to once again build
against the LLVM that is included in the Rust tree, and reverts the
.travis.yml changes from that patch.
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | .travis.yml | 6 | ||||
| m--------- | src/tools/clang | 0 | ||||
| m--------- | src/tools/lldb | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 1631daac76c..5753e9ed45e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,8 +59,8 @@ [submodule "src/tools/lldb"] path = src/tools/lldb url = https://github.com/rust-lang-nursery/lldb/ - branch = rust-release-70 + branch = rust-release-80-v1 [submodule "src/tools/clang"] path = src/tools/clang url = https://github.com/rust-lang-nursery/clang/ - branch = release_70 + branch = rust-release-80-v1 diff --git a/.travis.yml b/.travis.yml index 4a7c8f4b7cf..b1701e4a654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" + RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb" SRC=. DEPLOY_ALT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 @@ -87,7 +87,7 @@ matrix: # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7. - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler" + RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 @@ -101,7 +101,7 @@ matrix: - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler" + RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 diff --git a/src/tools/clang b/src/tools/clang -Subproject 2a284a70e26997273c296afe06586ffdf3a142f +Subproject d0fc1788123de9844c8088b977cd142021cea1f diff --git a/src/tools/lldb b/src/tools/lldb -Subproject 3dbe998969d457c5cef245f61b48bdaed0f5c05 +Subproject 7728fa22bebea288abfea3b70cf795c60b93df3 |