build/xilinx/programmer: fix vivado_cmd when settings are sourced manually.

This commit is contained in:
Florent Kermarrec 2019-12-30 10:07:08 +01:00
parent ffa7ca8f0b
commit 85ade2b3b3
1 changed files with 2 additions and 2 deletions

View File

@ -139,8 +139,8 @@ def _run_vivado(path, ver, cmds):
break break
else: else:
raise OSError("Unable to locate Vivado directory or settings.") raise OSError("Unable to locate Vivado directory or settings.")
vivado_cmd += "source " + settings vivado_cmd += "source " + settings + " && "
vivado_cmd += " && vivado -mode tcl" vivado_cmd += "vivado -mode tcl"
with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process: with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process:
process.stdin.write(cmds.encode("ASCII")) process.stdin.write(cmds.encode("ASCII"))
process.communicate() process.communicate()