From 999595f640b0f64c682ee78dfa82b6a43d979ec2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 27 Nov 2018 13:06:49 -0700 Subject: [PATCH] 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. --- .gitmodules | 4 ++-- .travis.yml | 6 +++--- src/tools/clang | 2 +- src/tools/lldb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index bf9bdd9a5b4b0..304bdeff4294c 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 fa66220f442c5..14fb17aeeddca 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 index d0fc1788123de..032312dd0140a 160000 --- a/src/tools/clang +++ b/src/tools/clang @@ -1 +1 @@ -Subproject commit d0fc1788123de9844c8088b977cd142021cea1f2 +Subproject commit 032312dd0140a7074c9b89d305fe44eb0e44e407 diff --git a/src/tools/lldb b/src/tools/lldb index fdea743be550e..8ad0817ce45b0 160000 --- a/src/tools/lldb +++ b/src/tools/lldb @@ -1 +1 @@ -Subproject commit fdea743be550ed8d7b61b2c908944cdd1290a6ad +Subproject commit 8ad0817ce45b0eef9d374691b23f2bd69c164254