diff options
| author | Andrew Zonenberg <azonenberg@drawersteak.com> | 2016-03-30 20:38:18 -0700 |
|---|---|---|
| committer | Andrew Zonenberg <azonenberg@drawersteak.com> | 2016-03-30 20:38:18 -0700 |
| commit | d16d05e41587a282a53eda59af837b7d264498fc (patch) | |
| tree | 01febb97bddc8cefa1352916d1b1c5baca21b101 /passes | |
| parent | 94a6923e7dd363c5b11116e9bd85aa012fed512a (diff) | |
| parent | 0db53284fd610cac1e956a87c7eec7df3d8564c5 (diff) | |
| download | yosys-d16d05e41587a282a53eda59af837b7d264498fc.tar.gz yosys-d16d05e41587a282a53eda59af837b7d264498fc.tar.bz2 yosys-d16d05e41587a282a53eda59af837b7d264498fc.zip | |
Merge https://github.com/cliffordwolf/yosys
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/cmds/plugin.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc index e2d80d9bf..828c671de 100644 --- a/passes/cmds/plugin.cc +++ b/passes/cmds/plugin.cc @@ -31,19 +31,23 @@ std::map<std::string, std::string> loaded_plugin_aliases; #ifdef YOSYS_ENABLE_PLUGINS void load_plugin(std::string filename, std::vector<std::string> aliases) { + std::string orig_filename = filename; + if (filename.find('/') == std::string::npos) filename = "./" + filename; if (!loaded_plugins.count(filename)) { void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL); + if (hdl == NULL && orig_filename.find('/') == std::string::npos) + hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); if (hdl == NULL) log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror()); - loaded_plugins[filename] = hdl; + loaded_plugins[orig_filename] = hdl; Pass::init_register(); } for (auto &alias : aliases) - loaded_plugin_aliases[alias] = filename; + loaded_plugin_aliases[alias] = orig_filename; } #else void load_plugin(std::string, std::vector<std::string>) |