Skip to content

Commit 780b0c7

Browse files
committed
Auto merge of #53951 - tromey:restore-lldb-build, r=alexcrichton
Restore lldb build commit 6c10142 ("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.
2 parents d8af8b6 + 7bb30ff commit 780b0c7

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
@@ -59,8 +59,8 @@
5959
[submodule "src/tools/lldb"]
6060
path = src/tools/lldb
6161
url = https://github.com/rust-lang-nursery/lldb/
62-
branch = rust-release-70
62+
branch = rust-release-80-v1
6363
[submodule "src/tools/clang"]
6464
path = src/tools/clang
6565
url = https://github.com/rust-lang-nursery/clang/
66-
branch = release_70
66+
branch = rust-release-80-v1

.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"
33+
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb"
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"
90+
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb"
9191
SRC=.
9292
DEPLOY=1
9393
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -101,7 +101,7 @@ matrix:
101101
102102
- env: >
103103
RUST_CHECK_TARGET=dist
104-
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"
104+
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"
105105
SRC=.
106106
DEPLOY=1
107107
RUSTC_RETRY_LINKER_ON_SEGFAULT=1

src/tools/clang

Submodule clang updated 859 files

src/tools/lldb

Submodule lldb updated from 3dbe998 to 7728fa2

0 commit comments

Comments
 (0)