From: user <calle@alukiste>
Date: Wed, 7 Aug 2013 16:26:40 +0000 (+0200)
Subject: Fix missing string replace. Added support for 32-bit ISE if 64-bit version is missing... 
X-Git-Tag: 24jan2021_ls180~2099^2~443^2~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d531ba06a1d86edead693ef9db079b8c04a0286;p=litex.git

Fix missing string replace. Added support for 32-bit ISE if 64-bit version is missing on 64-bit system.
---

diff --git a/mibuild/xilinx_ise.py b/mibuild/xilinx_ise.py
index b7dc2580..2ed13082 100644
--- a/mibuild/xilinx_ise.py
+++ b/mibuild/xilinx_ise.py
@@ -103,7 +103,11 @@ def _run_ise(build_name, ise_path, source, mode="verilog"):
 		vers = [ver for ver in os.listdir(ise_path) if _is_valid_version(ise_path, ver)]
 		tools_version = max(vers)
 		bits = struct.calcsize("P")*8
-		xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, bits) 
+		
+		xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, bits)
+		if not os.path.exists(xilinx_settings_file) and bits == 64:
+			# if we are on 64-bit system but the toolchain isn't, try the 32-bit env.
+			xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, 32)
 		build_script_contents += "source " + xilinx_settings_file + "\n"
 	if mode == "edif":
 		build_script_contents += """
@@ -111,7 +115,7 @@ ngdbuild -uc {build_name}.ucf {build_name}.edif {build_name}.ngd""".format(build
 	else:
 		build_script_contents += """
 xst -ifn {build_name}.xst
-ngdbuild -uc {build_name}.ucf {build_name}.ngc {build_name}.ngd"""
+ngdbuild -uc {build_name}.ucf {build_name}.ngc {build_name}.ngd""".format(build_name=build_name)
 	
 	build_script_contents += """
 map -ol high -w -o {build_name}_map.ncd {build_name}.ngd {build_name}.pcf