Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/xilinx: fix build with LITEX_ENV_VIVADO/LITEX_ENV_ISE set by user.

This commit is contained in:
Florent Kermarrec 2020-11-18 15:40:06 +01:00
parent ee1ea9baab
commit 444a605dea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/build/xilinx/ise.py
View File

@ -161,10 +161,10 @@ bitgen {bitgen_opt} {build_name}.ncd {build_name}.bit{fail_stmt}
tools.write_to_file(build_script_file, build_script_contents, force_unix=False) tools.write_to_file(build_script_file, build_script_contents, force_unix=False)
command = shell + [build_script_file] command = shell + [build_script_file]
if which("ise") is None: if which("ise") is None and os.getenv("LITEX_ENV_ISE", False) == False:
msg = "Unable to find or source ISE toolchain, please either:\n" msg = "Unable to find or source ISE toolchain, please either:\n"
msg += "- Source ISE's settings manually.\n" msg += "- Source ISE's settings manually.\n"
msg += "- Or set LITEX_ISE_VIVADO environment variant to ISE's settings path.\n" msg += "- Or set LITEX_ENV_ISE environment variant to ISE's settings path.\n"
msg += "- Or add ISE toolchain to your $PATH." msg += "- Or add ISE toolchain to your $PATH."
raise OSError(msg) raise OSError(msg)

2
litex/build/xilinx/vivado.py
View File

@ -90,7 +90,7 @@ def _run_script(script):
else: else:
shell = ["bash"] shell = ["bash"]
if which("vivado") is None: if which("vivado") is None and os.getenv("LITEX_ENV_VIVADO", False) == False:
msg = "Unable to find or source Vivado toolchain, please either:\n" msg = "Unable to find or source Vivado toolchain, please either:\n"
msg += "- Source Vivado's settings manually.\n" msg += "- Source Vivado's settings manually.\n"
msg += "- Or set LITEX_ENV_VIVADO environment variant to Vivado's settings path.\n" msg += "- Or set LITEX_ENV_VIVADO environment variant to Vivado's settings path.\n"