fixup! fixup! sdc_expand, opensta: start

Author: widlarizer

techlibs/common/opensta.cc

@@ -1,11 +1,10 @@
-// #include "kernel/register.h"
-// #include "kernel/celltypes.h"
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
+#if !defined(YOSYS_DISABLE_SPAWN)
 struct OpenstaPass : public Pass
 {
 	const char* default_sta_cmd = "sta";
@@ -36,7 +35,7 @@ struct OpenstaPass : public Pass
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		string run_from, run_to;
-		string opensta_exe;
+		string opensta_exe = "sta";
 		string sdc_filename, sdc_expanded_filename;
 		string tempdir_name, script_filename;
 		string verilog_filename, liberty_filename;
@@ -107,13 +106,13 @@ struct OpenstaPass : public Pass
 		else
 			log("sdc_expanded_filename: %s\n", sdc_expanded_filename.c_str());
 
-		// verilog_filename
 		if (cleanup) {
 			log("Removing temp directory.\n");
 			remove_directory(tempdir_name);
 		}
 		log_pop();
 	}
 } OpenstaPass;
+#endif
 
 PRIVATE_NAMESPACE_END

techlibs/common/sdc_expand.cc

@@ -137,13 +137,14 @@ struct SdcexpandPass : public ScriptPass
 			opensta_pass_call += " -nocleanup";
 		run(opensta_pass_call.c_str());
 
-		if (!help_mode)
+		if (!help_mode) {
 			if (cleanup) {
 				log("Removing temp directory.\n");
 				remove_directory(tempdir_name);
 			} else {
 				log("Keeping temp directory %s\n", tempdir_name.c_str());
 			}
+		}
 		run("design -load pre_expand");
 	}
 } SdcexpandPass;