tjh.dev
1diff --git a/src/data/gdb_preamble/preamble.py b/src/data/gdb_preamble/preamble.py
2index 4855231b5..a488025c1 100644
3--- a/src/data/gdb_preamble/preamble.py
4+++ b/src/data/gdb_preamble/preamble.py
5@@ -773,7 +773,7 @@ def resolve_modules():
6 # core doesn't contain one. That makes the ids a bit unreliable but still better than nothing I suppose.
7 # Ultimately we'll want to use gdb here.
8 # https://sourceware.org/bugzilla/show_bug.cgi?id=32844
9- output = get_stdout(['eu-unstrip', "--list-only", f"--core={corefile}"], env=env)
10+ output = get_stdout(['@eu-unstrip@', "--list-only", f"--core={corefile}"], env=env)
11 for line in output.splitlines():
12 image = CoreImage(line)
13 if image.valid:
14diff --git a/src/debugger.cpp b/src/debugger.cpp
15index 946bdd12e..5c24b3713 100644
16--- a/src/debugger.cpp
17+++ b/src/debugger.cpp
18@@ -36,12 +36,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
19 result.push_back(std::make_shared<Data>(
20 Data{.displayName = i18nc("@label the debugger called GDB", "GDB"),
21 .codeName = u"gdb"_s,
22- .tryExec = u"gdb"_s,
23+ .tryExec = u"@gdb@"_s,
24 .backendData =
25- BackendData{.command = u"gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
26+ BackendData{.command = u"@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
27 .supportsCommandWithSymbolResolution = true,
28 .commandWithSymbolResolution =
29- u"gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
30+ u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
31 .backtraceBatchCommands = u"thread\nthread apply all bt"_s,
32 .preambleCommands = expandCommand(
33 u"gdb"_s,
34@@ -63,12 +63,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
35 Data{
36 .displayName = i18nc("@label the debugger called GDB", "GDB"),
37 .codeName = u"gdb"_s,
38- .tryExec = u"gdb"_s,
39+ .tryExec = u"@gdb@"_s,
40 .backendData = BackendData{
41- .command = u"gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
42+ .command = u"@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
43 .supportsCommandWithSymbolResolution = true,
44 .commandWithSymbolResolution =
45- u"gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
46+ u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
47 .backtraceBatchCommands = u"thread\nthread apply all bt"_s,
48 .preambleCommands = expandCommand(
49 u"gdb"_s,