mirror of
https://github.com/rust-lang/rust.git
synced 2026-06-02 06:28:20 +03:00
8aae6ca44a
We're shipping a rust-enabled lldb, but the "lldb" executable is not installed into the "bin" directory by rustup. See the discussion in https://github.com/rust-lang-nursery/rustup.rs/pull/1492 for background on this decision. There, we agreed to have rust-lldb prefer the rust-enabled lldb if it is installed. This patch changes dist.rs to put lldb into rustlib, following what was done for the other LLVM tools in #53955, and then fixes rust-lldb to prefer that lldb, if it exists. See issue #48168
47 lines
1.7 KiB
Bash
Executable File
47 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
# file at the top-level directory of this distribution and at
|
|
# http://rust-lang.org/COPYRIGHT.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
# option. This file may not be copied, modified, or distributed
|
|
# except according to those terms.
|
|
|
|
# Exit if anything fails
|
|
set -e
|
|
|
|
# Find out where to look for the pretty printer Python module
|
|
RUSTC_SYSROOT=`rustc --print sysroot`
|
|
|
|
# Find the host triple so we can find lldb in rustlib.
|
|
host=`rustc -vV | sed -n -e 's/^host: //p'`
|
|
|
|
lldb=lldb
|
|
if [ -f "$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" ]; then
|
|
lldb="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
|
|
else
|
|
LLDB_VERSION=`"$lldb" --version 2>/dev/null | head -1 | cut -d. -f1`
|
|
|
|
if [ "$LLDB_VERSION" = "lldb-350" ]
|
|
then
|
|
echo "***"
|
|
echo \
|
|
"WARNING: This version of LLDB has known issues with Rust and cannot \
|
|
display the contents of local variables!"
|
|
echo "***"
|
|
fi
|
|
fi
|
|
|
|
# Prepare commands that will be loaded before any file on the command line has been loaded
|
|
script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
|
|
category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust"
|
|
category_enable="type category enable Rust"
|
|
|
|
# Call LLDB with the commands added to the argument list
|
|
exec "$lldb" --one-line-before-file="$script_import" \
|
|
--one-line-before-file="$category_definition" \
|
|
--one-line-before-file="$category_enable" \
|
|
"$@"
|