diff options
| author | whitequark <whitequark@whitequark.org> | 2020-05-01 21:28:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 21:28:20 +0000 |
| commit | bbde2419420a86635baf2b730ebe58ed6edca5bb (patch) | |
| tree | 0dbd707b90ba392f540e63fe41d2179b3b97440d /passes/cmds/show.cc | |
| parent | 667f38fe533c9f6676b5944d801a5fb33938ef8b (diff) | |
| parent | b43c282e4e0de53b9323a5d8d85b07bc73324a17 (diff) | |
| download | yosys-bbde2419420a86635baf2b730ebe58ed6edca5bb.tar.gz yosys-bbde2419420a86635baf2b730ebe58ed6edca5bb.tar.bz2 yosys-bbde2419420a86635baf2b730ebe58ed6edca5bb.zip | |
Merge pull request #2001 from whitequark/wasi
Add WASI platform support
Diffstat (limited to 'passes/cmds/show.cc')
| -rw-r--r-- | passes/cmds/show.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc index 155ed0fcd..fa922454a 100644 --- a/passes/cmds/show.cc +++ b/passes/cmds/show.cc @@ -682,7 +682,7 @@ struct ShowPass : public Pass { std::vector<std::pair<std::string, RTLIL::Selection>> color_selections; std::vector<std::pair<std::string, RTLIL::Selection>> label_selections; -#if defined(EMSCRIPTEN) || defined(_WIN32) +#if defined(_WIN32) || defined(YOSYS_DISABLE_SPAWN) std::string format = "dot"; std::string prefix = "show"; #else @@ -849,10 +849,15 @@ struct ShowPass : public Pass { std::string cmd = stringf(DOT_CMD, format.c_str(), dot_file.c_str(), out_file.c_str(), out_file.c_str(), out_file.c_str()); #undef DOT_CMD log("Exec: %s\n", cmd.c_str()); - if (run_command(cmd) != 0) - log_cmd_error("Shell command failed!\n"); + #if !defined(YOSYS_DISABLE_SPAWN) + if (run_command(cmd) != 0) + log_cmd_error("Shell command failed!\n"); + #endif } + #if defined(YOSYS_DISABLE_SPAWN) + log_assert(viewer_exe.empty() && !format.empty()); + #else if (!viewer_exe.empty()) { #ifdef _WIN32 // system()/cmd.exe does not understand single quotes nor @@ -876,6 +881,7 @@ struct ShowPass : public Pass { if (run_command(cmd) != 0) log_cmd_error("Shell command failed!\n"); } + #endif if (flag_pause) { #ifdef YOSYS_ENABLE_READLINE |