mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-enable lldb

Browse source 
Commit 7215963e56 disabled lldb due to the LLVM update.  This patch
updates lldb to build against the Rust LLVM, and re-enables it.
This commit is contained in:
Tom Tromey 2018-11-27 13:06:49 -07:00
parent aeff91d977
commit 999595f640
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

@ -56,9 +56,9 @@
[submodule "src/tools/lldb"] [submodule "src/tools/lldb"]
path = src/tools/lldb path = src/tools/lldb
url = https://github.com/rust-lang-nursery/lldb.git url = https://github.com/rust-lang-nursery/lldb.git
branch = rust-release-80-v1 branch = rust-release-80-v2
[submodule "src/tools/clang"] [submodule "src/tools/clang"]
path = src/tools/clang path = src/tools/clang
url = https://github.com/rust-lang-nursery/clang.git url = https://github.com/rust-lang-nursery/clang.git
branch = rust-release-80-v1 branch = rust-release-80-v2

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 --set rust.jemalloc" RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb --set rust.jemalloc"
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 --set rust.jemalloc" RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc"
SRC=. SRC=.
DEPLOY=1 DEPLOY=1
RUSTC_RETRY_LINKER_ON_SEGFAULT=1 RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@ -102,7 +102,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 --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=. 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 d0fc1788123de9844c8088b977cd142021cea1f2 Subproject commit 032312dd0140a7074c9b89d305fe44eb0e44e407

2
src/tools/lldb

@ -1 +1 @@
Subproject commit fdea743be550ed8d7b61b2c908944cdd1290a6ad Subproject commit 8ad0817ce45b0eef9d374691b23f2bd69c164254