Skip to content

Commit adeb603

Browse files
authored
Rollup merge of rust-lang#133737 - Walnut356:msvc_visualizers, r=onur-ozkan
Include LLDB and GDB visualizers in MSVC distribution MSVC distributions currently don't include the lldb or GDB python files. MSVC and LLDB/GDB are not mutually exclusive (and end up being a common case with vscode + codelldb/lldb-dap), so they should probably be included. the existing visualizers currently only partially work on MSVC due to the differences in how the debug info is generated, but they also only partially work on GNU anyway - both of which are actively being fixed.
2 parents 96e51d9 + e75aa44 commit adeb603

File tree

1 file changed

+14
-14
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+14
-14
lines changed

src/bootstrap/src/core/build_steps/dist.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -549,24 +549,24 @@ impl Step for DebuggerScripts {
549549
cp_debugger_script("natvis/liballoc.natvis");
550550
cp_debugger_script("natvis/libcore.natvis");
551551
cp_debugger_script("natvis/libstd.natvis");
552-
} else {
553-
cp_debugger_script("rust_types.py");
552+
}
554553

555-
// gdb debugger scripts
556-
builder.install(&builder.src.join("src/etc/rust-gdb"), &sysroot.join("bin"), 0o755);
557-
builder.install(&builder.src.join("src/etc/rust-gdbgui"), &sysroot.join("bin"), 0o755);
554+
cp_debugger_script("rust_types.py");
558555

559-
cp_debugger_script("gdb_load_rust_pretty_printers.py");
560-
cp_debugger_script("gdb_lookup.py");
561-
cp_debugger_script("gdb_providers.py");
556+
// gdb debugger scripts
557+
builder.install(&builder.src.join("src/etc/rust-gdb"), &sysroot.join("bin"), 0o755);
558+
builder.install(&builder.src.join("src/etc/rust-gdbgui"), &sysroot.join("bin"), 0o755);
562559

563-
// lldb debugger scripts
564-
builder.install(&builder.src.join("src/etc/rust-lldb"), &sysroot.join("bin"), 0o755);
560+
cp_debugger_script("gdb_load_rust_pretty_printers.py");
561+
cp_debugger_script("gdb_lookup.py");
562+
cp_debugger_script("gdb_providers.py");
565563

566-
cp_debugger_script("lldb_lookup.py");
567-
cp_debugger_script("lldb_providers.py");
568-
cp_debugger_script("lldb_commands")
569-
}
564+
// lldb debugger scripts
565+
builder.install(&builder.src.join("src/etc/rust-lldb"), &sysroot.join("bin"), 0o755);
566+
567+
cp_debugger_script("lldb_lookup.py");
568+
cp_debugger_script("lldb_providers.py");
569+
cp_debugger_script("lldb_commands")
570570
}
571571
}
572572

0 commit comments

Comments
 (0)