fix annoying error msg when executing sim makefile

9353ec30 · Pawel Szostek · 64eb10da · 9353ec30 · 9353ec30
Commit 9353ec30 authored Jan 24, 2014 by Pawel Szostek
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

makefile_writer.py hdlmake/makefile_writer.py +1 -1

ise.py hdlmake/tools/ise.py +1 -1

No files found.
--- a/hdlmake/makefile_writer.py
+++ b/hdlmake/makefile_writer.py
@@ -394,7 +394,7 @@ sim_post_cmd: sim
 \t\t${sim_post_cmd}

 modelsim.ini: ${modelsim_ini_path}
-\t\tcp $$< .
+\t\tcp $$< . 2>&1
 clean:
 \t\trm -rf ./modelsim.ini $$(LIBS)
 .PHONY: clean sim_pre_cmd sim_post_cmd

--- a/hdlmake/tools/ise.py
+++ b/hdlmake/tools/ise.py
@@ -368,6 +368,6 @@ class XilinxsiminiReader(object):
        xilinx_ini_path = str(os.path.join(global_mod.env["xilinx"],
                              "vhdl",
                              "hdp",
-                              "lin" if global_mod.env["architecture"] is 32 else "lin64"))
+                              "lin" if global_mod.env["architecture"] == 32 else "lin64"))
        # Ensure the path is absolute and normalized
        return os.path.abspath(xilinx_ini_path)