diff options
| author | Tom Tromey <tom@tromey.com> | 2018-11-27 13:06:49 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-11-27 13:07:16 -0700 |
| commit | 999595f640b0f64c682ee78dfa82b6a43d979ec2 (patch) | |
| tree | 8d30a38c869473bab90a139325bd79dd2b0caf9f | |
| parent | aeff91d97702c11cdb5992fd18bb2cf2fb99efda (diff) | |
| download | rust-999595f640b0f64c682ee78dfa82b6a43d979ec2.tar.gz rust-999595f640b0f64c682ee78dfa82b6a43d979ec2.zip | |
Re-enable lldb
Commit 7215963e56 disabled lldb due to the LLVM update. This patch updates lldb to build against the Rust LLVM, and re-enables it.
| -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 bf9bdd9a5b4..304bdeff429 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,9 +56,9 @@ [submodule "src/tools/lldb"] path = src/tools/lldb url = https://github.com/rust-lang-nursery/lldb.git - branch = rust-release-80-v1 + branch = rust-release-80-v2 [submodule "src/tools/clang"] path = src/tools/clang url = https://github.com/rust-lang-nursery/clang.git - branch = rust-release-80-v1 + branch = rust-release-80-v2 diff --git a/.travis.yml b/.travis.yml index fa66220f442..14fb17aeedd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: - env: > RUST_CHECK_TARGET=dist - RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --set rust.jemalloc" + RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb --set rust.jemalloc" 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 --set rust.jemalloc" + RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 @@ -102,7 +102,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 --set rust.jemalloc" + 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 --set rust.jemalloc" SRC=. DEPLOY=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1 diff --git a/src/tools/clang b/src/tools/clang -Subproject d0fc1788123de9844c8088b977cd142021cea1f +Subproject 032312dd0140a7074c9b89d305fe44eb0e44e40 diff --git a/src/tools/lldb b/src/tools/lldb -Subproject fdea743be550ed8d7b61b2c908944cdd1290a6a +Subproject 8ad0817ce45b0eef9d374691b23f2bd69c16425 |