Skip to content

Commit 999595f

Browse files
committedNov 27, 2018
Re-enable lldb
Commit 7215963 disabled lldb due to the LLVM update. This patch updates lldb to build against the Rust LLVM, and re-enables it.

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed
 

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
[submodule "src/tools/lldb"]
5757
path = src/tools/lldb
5858
url = https://github.com/rust-lang-nursery/lldb.git
59-
branch = rust-release-80-v1
59+
branch = rust-release-80-v2
6060
[submodule "src/tools/clang"]
6161
path = src/tools/clang
6262
url = https://github.com/rust-lang-nursery/clang.git
63-
branch = rust-release-80-v1
63+
branch = rust-release-80-v2
6464

‎.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ matrix:
3030

3131
- env: >
3232
RUST_CHECK_TARGET=dist
33-
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --set rust.jemalloc"
33+
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb --set rust.jemalloc"
3434
SRC=.
3535
DEPLOY_ALT=1
3636
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -87,7 +87,7 @@ matrix:
8787
# OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
8888
- env: >
8989
RUST_CHECK_TARGET=dist
90-
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --set rust.jemalloc"
90+
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc"
9191
SRC=.
9292
DEPLOY=1
9393
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -102,7 +102,7 @@ matrix:
102102
103103
- env: >
104104
RUST_CHECK_TARGET=dist
105-
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"
105+
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"
106106
SRC=.
107107
DEPLOY=1
108108
RUSTC_RETRY_LINKER_ON_SEGFAULT=1

‎src/tools/clang

Submodule clang updated 1604 files

‎src/tools/lldb

Submodule lldb updated from fdea743 to 8ad0817

0 commit comments

Comments
 (0)
Please sign in to comment.