diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-05-22 13:46:38 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2019-05-22 13:46:38 +0200 |
| commit | 0971f772d7975a3e6e3772838ce8e333a2a088c4 (patch) | |
| tree | a11d45ae153475803d6db55d237a437a91496029 | |
| parent | 5c164d0863078779fd27aefa665b5e6e457ca39b (diff) | |
| download | yosys-0971f772d7975a3e6e3772838ce8e333a2a088c4.tar.gz yosys-0971f772d7975a3e6e3772838ce8e333a2a088c4.tar.bz2 yosys-0971f772d7975a3e6e3772838ce8e333a2a088c4.zip | |
Fix handling of warning and error messages within log_make_debug-blocks
Signed-off-by: Clifford Wolf <clifford@clifford.at>
| -rw-r--r-- | kernel/log.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/log.cc b/kernel/log.cc index 9a9104e26..fa74a6a3c 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -230,6 +230,9 @@ static void logv_warning_with_prefix(const char *prefix, } else { + int bak_log_make_debug = log_make_debug; + log_make_debug = 0; + for (auto &re : log_werror_regexes) if (std::regex_search(message, re)) log_error("%s", message.c_str()); @@ -254,6 +257,7 @@ static void logv_warning_with_prefix(const char *prefix, } log_warnings_count++; + log_make_debug = bak_log_make_debug; } } @@ -285,6 +289,9 @@ static void logv_error_with_prefix(const char *prefix, #ifdef EMSCRIPTEN auto backup_log_files = log_files; #endif + int bak_log_make_debug = log_make_debug; + log_make_debug = 0; + log_suppressed(); if (log_errfile != NULL) log_files.push_back(log_errfile); @@ -298,6 +305,8 @@ static void logv_error_with_prefix(const char *prefix, log("%s%s", prefix, log_last_error.c_str()); log_flush(); + log_make_debug = bak_log_make_debug; + if (log_error_atexit) log_error_atexit(); |