languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-14 12:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore lldb build

Browse source 
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.
This commit is contained in:
Tom Tromey 2018-09-04 09:55:41 -06:00
parent 4efc0a7811
commit 289da84381
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -59,8 +59,8 @@
[submodule "src/tools/lldb"] [submodule "src/tools/lldb"]
path = src/tools/lldb path = src/tools/lldb
url = https://github.com/rust-lang-nursery/lldb/ url = https://github.com/rust-lang-nursery/lldb/
branch = rust-release-70 branch = rust-release-80-v1
[submodule "src/tools/clang"] [submodule "src/tools/clang"]
path = src/tools/clang path = src/tools/clang
url = https://github.com/rust-lang-nursery/clang/ url = https://github.com/rust-lang-nursery/clang/
branch = release_70 branch = rust-release-80-v1

6
.travis.yml
View file

@ -30,7 +30,7 @@ matrix:
- env: > - env: >
RUST_CHECK_TARGET=dist RUST_CHECK_TARGET=dist
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb"
SRC=. SRC=.
DEPLOY_ALT=1 DEPLOY_ALT=1
RUSTC_RETRY_LINKER_ON_SEGFAULT=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. # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
- env: > - env: >
RUST_CHECK_TARGET=dist 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=. SRC=.
DEPLOY=1 DEPLOY=1
RUSTC_RETRY_LINKER_ON_SEGFAULT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@ -101,7 +101,7 @@ matrix:
- env: > - env: >
RUST_CHECK_TARGET=dist 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=. SRC=.
DEPLOY=1 DEPLOY=1
RUSTC_RETRY_LINKER_ON_SEGFAULT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1

2
src/tools/clang

@ -1 +1 @@
Subproject commit 2a284a70e26997273c296afe06586ffdf3a142fd Subproject commit d0fc1788123de9844c8088b977cd142021cea1f2

2
src/tools/lldb

@ -1 +1 @@
Subproject commit 3dbe998969d457c5cef245f61b48bdaed0f5c059 Subproject commit 3be47d264e91844544d56078a18182b8a7418086