Merge pull request #4675 from YosysHQ/emil/pyosys-fix-segfault

yosys: fix pyosys initialization segfault
YosysHQ · Nov 1, 2024 · b2d7858 · b2d7858
2 parents 8fb73e1 + 37e61b9
commit b2d7858
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
@@ -547,12 +547,6 @@ void yosys_setup()
 	if(already_setup)
 		return;
 	already_setup = true;
-	init_share_dirname();
-	init_abc_executable_name();
-
-#define X(_id) RTLIL::ID::_id = "\\" # _id;
-#include "kernel/constids.inc"
-#undef X
 
 #ifdef WITH_PYTHON
 	// With Python 3.12, calling PyImport_AppendInittab on an already
@@ -566,6 +560,13 @@ void yosys_setup()
 	}
 #endif
 
+	init_share_dirname();
+	init_abc_executable_name();
+
+#define X(_id) RTLIL::ID::_id = "\\" # _id;
+#include "kernel/constids.inc"
+#undef X
+
 	Pass::init_register();
 	yosys_design = new RTLIL::Design;
 	yosys_celltypes.setup();

diff --git a/setup.py b/setup.py
@@ -76,7 +76,7 @@ def custom_build(self, bext: build_ext):
         # yosys-abc
         yosys_abc_target = os.path.join(pyosys_path, "yosys-abc")
         shutil.copy("yosys-abc", yosys_abc_target)
-        bext.spawn(["strip", "-S", "yosys-abc"])
+        bext.spawn(["strip", "-S", yosys_abc_target])
 
         # share directory
         share_target = os.path.join(pyosys_path, "share")