Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable --debugger-stop with -X #149

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Enable --debugger-stop with -X #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 38 additions & 39 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,50 +1448,49 @@ main (int argc, const char **argv, char **envp)
*/
db_level |= DB_BASIC | DB_CALL | DB_SHELL | DB_UPDATE_GOAL
| DB_MAKEFILES;
} else {
/* debugging sets some things */
if (debugger_opts) {
const char **p;
b_show_version = true;
for (p = debugger_opts->list; *p != 0; ++p)
{
if (0 == strcmp(*p, "preread")) {
b_debugger_preread = true;
db_level |= DB_READ_MAKEFILES;
}
}
/* debugging sets some things */
if (debugger_opts) {
const char **p;
b_show_version = true;
for (p = debugger_opts->list; *p != 0; ++p)
{
if (0 == strcmp(*p, "preread")) {
b_debugger_preread = true;
db_level |= DB_READ_MAKEFILES;
}

if (0 == strcmp(*p, "goal")) {
b_debugger_goal = true;
db_level |= DB_UPDATE_GOAL;
}
if (0 == strcmp(*p, "goal")) {
b_debugger_goal = true;
db_level |= DB_UPDATE_GOAL;
}

if ( 0 == strcmp(*p, "full") || b_debugger_preread || b_debugger_goal
|| 0 == strcmp(*p, "preaction") ) {
job_slots = 1;
i_debugger_stepping = 1;
i_debugger_nexting = 0;
debugger_enabled = 1;
/* For now we'll do basic debugging. Later, "stepping'
will stop here while next won't - either way no printing.
*/
db_level |= DB_BASIC | DB_CALL | DB_UPDATE_GOAL
| b_debugger_goal ? 0 : DB_SHELL
| DB_MAKEFILES;
}
if ( 0 == strcmp(*p, "full") || b_debugger_goal
|| 0 == strcmp(*p, "error") ) {
debugger_on_error |= (DEBUGGER_ON_ERROR|DEBUGGER_ON_FATAL);
} else if ( 0 == strcmp(*p, "fatal") ) {
debugger_on_error |= DEBUGGER_ON_FATAL;
}
if ( 0 == strcmp(*p, "full") || b_debugger_preread || b_debugger_goal
|| 0 == strcmp(*p, "preaction") ) {
job_slots = 1;
i_debugger_stepping = 1;
i_debugger_nexting = 0;
debugger_enabled = 1;
/* For now we'll do basic debugging. Later, "stepping'
will stop here while next won't - either way no printing.
*/
db_level |= DB_BASIC | DB_CALL | DB_UPDATE_GOAL
| b_debugger_goal ? 0 : DB_SHELL
| DB_MAKEFILES;
}
if ( 0 == strcmp(*p, "full") || b_debugger_goal
|| 0 == strcmp(*p, "error") ) {
debugger_on_error |= (DEBUGGER_ON_ERROR|DEBUGGER_ON_FATAL);
} else if ( 0 == strcmp(*p, "fatal") ) {
debugger_on_error |= DEBUGGER_ON_FATAL;
}
}
#ifndef HAVE_LIBREADLINE
O (error, NILF,
"warning: you specified a debugger option, but you don't have readline support");
O (error, NILF,
"debugger support compiled in. Debugger options will be ignored.");
O (error, NILF,
"warning: you specified a debugger option, but you don't have readline support");
O (error, NILF,
"debugger support compiled in. Debugger options will be ignored.");
#endif
}
}

/* Set always_make_flag if -B was given and we've not restarted already. */
Expand Down
Loading