correct 32/64 bit paths for xilinxsim.ini

4fe83934 · Pawel Szostek · 9f9e715c · 4fe83934 · 4fe83934
Commit 4fe83934 authored Oct 23, 2013 by Pawel Szostek
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

env.py hdlmake/env.py +1 -0

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

No files found.
--- a/hdlmake/env.py
+++ b/hdlmake/env.py
@@ -128,6 +128,7 @@ class Env(dict):

    def check_env(self, verbose=False):
        print.set_verbose(verbose)
+        self["architecture"] = 64 if _64bit_architecture else 32
        platform = sys.platform
        print("Platform: %s" % platform)


--- a/hdlmake/tools/ise.py
+++ b/hdlmake/tools/ise.py
@@ -365,6 +365,9 @@ class XilinxsiminiReader(object):
        # except KeyError:
        #     logging.error("Please set the environment variable HOST_PLATFORM")
        #     quit()
-        xilinx_ini_path = str(global_mod.env["xilinx"] + "/ISE/vhdl/hdp/lin")
+        xilinx_ini_path = str(os.path.join(global_mod.env["xilinx"],
+                              "vhdl",
+                              "hdp",
+                              "lin" if global_mod.env["architecture"] is 32 else "lin64"))
        # Ensure the path is absolute and normalized
        return os.path.abspath(xilinx_ini_path)