riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

The share directory cannot be searched when used as a Python library, only in shell mode

This commit is contained in:
Benedikt Tutzer 2018-08-20 15:27:50 +02:00
parent 6d18837d62
commit d41c68ee5a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/driver.cc
View File

@ -110,6 +110,10 @@ int main(int argc, char **argv)
log_error_stderr = true; log_error_stderr = true;
yosys_banner(); yosys_banner();
yosys_setup(); yosys_setup();
#ifdef WITH_PYTHON
PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
#endif
if (argc == 2) if (argc == 2)
{ {
@ -462,6 +466,10 @@ int main(int argc, char **argv)
#endif #endif
yosys_setup(); yosys_setup();
#ifdef WITH_PYTHON
PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
#endif
log_error_atexit = yosys_atexit; log_error_atexit = yosys_atexit;
for (auto &fn : plugin_filenames) for (auto &fn : plugin_filenames)

1
kernel/yosys.cc
View File

@ -495,7 +495,6 @@ void yosys_setup()
PyImport_AppendInittab((char*)"libyosys", INIT_MODULE); PyImport_AppendInittab((char*)"libyosys", INIT_MODULE);
Py_Initialize(); Py_Initialize();
PyRun_SimpleString("import sys"); PyRun_SimpleString("import sys");
PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
#endif #endif
Pass::init_register(); Pass::init_register();