Merge in

Silimate · Jan 5, 2025 · 26c59f8 · 26c59f8
2 parents d8dda5c + d869949
commit 26c59f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/cmake/FindTCL.cmake b/cmake/FindTCL.cmake
@@ -31,7 +31,7 @@ set(TCL_POSSIBLE_NAMES
 # tcl lib path guesses.
 if (NOT TCL_LIB_PATHS)
   if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(TCL_LIB_PATHS /opt/homebrew/Cellar/tcl-tk@8/8.6.16/lib /opt/homebrew/opt/tcl-tk/lib /usr/local/lib)
+    set(TCL_LIB_PATHS /opt/homebrew/Cellar/tcl-tk@8/8.6.16/lib /opt/homebrew/opt/tcl-tk@8/lib /usr/local/lib)
     set(TCL_NO_DEFAULT_PATH TRUE)
   elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(TCL_LIB_PATHS /usr/lib /usr/lib64 /usr/local/lib)

diff --git a/test/regression_vars.tcl b/test/regression_vars.tcl
@@ -134,9 +134,8 @@ record_sta_tests {
   get_noargs
   get_objrefs
   get_lib_pins_of_objects
-  write_timing_model_scalar
   report_checks_src_attr
-  report_checks_json
+  write_timing_model_scalar
   liberty_latch3
 }
 

diff --git a/util/Report.cc b/util/Report.cc
@@ -19,6 +19,7 @@
 #include <algorithm> // min
 #include <cstdlib>   // exit
 #include <cstring>   // strlen
+#include <csignal>   // signal
 
 #include "Machine.hh"
 #include "Error.hh"
@@ -299,7 +300,7 @@ Report::fileCritical(int /* id */,
   printToBufferAppend(fmt, args);
   printBufferLine();
   va_end(args);
-  exit(1);
+  raise(SIGABRT);
 }
 
 ////////////////////////////////////////////////////////////////

diff --git a/util/StringUtil.cc b/util/StringUtil.cc
@@ -20,6 +20,7 @@
 #include <cctype>
 #include <cstdio>
 #include <cstdlib> // exit
+#include <csignal> // signal
 #include <array>
 #include <algorithm>
 
@@ -217,7 +218,7 @@ stringDeleteCheck(const char *str)
 {
   if (isTmpString(str)) {
     printf("Critical error: stringDelete for tmp string.");
-    exit(1);
+    raise(SIGABRT);
   }
 }