From: Tim 'mithro' Ansell <me@mith.ro>
Date: Tue, 18 Dec 2018 05:11:14 +0000 (-0800)
Subject: Fix `-vlgincdir` for xst.
X-Git-Tag: 24jan2021_ls180~1435^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b2abc7e892590f3998c28005ec4ba90c19760f1;p=litex.git

Fix `-vlgincdir` for xst.

The command line is of the form;
```
-vlgincdir {"path1" "path2"}
```

Fixes the following error;
```
WARNING:Xst:3164 - Option "-vlgincdir" found multiple times in the command line. Only the first occurence is considered.
```
---

diff --git a/litex/build/xilinx/ise.py b/litex/build/xilinx/ise.py
index 9bdaaa5c..39ff5b48 100644
--- a/litex/build/xilinx/ise.py
+++ b/litex/build/xilinx/ise.py
@@ -58,8 +58,11 @@ def _build_xst_files(device, sources, vincpaths, build_name, xst_opt):
 -ofn {build_name}.ngc
 -p {device}
 """.format(build_name=build_name, xst_opt=xst_opt, device=device)
-    for path in vincpaths:
-        xst_contents += "-vlgincdir " + tools.cygpath(path) + "\n"
+    if vincpaths:
+        xst_contents += "-vlgincdir {"
+        for path in vincpaths:
+            xst_contents += tools.cygpath(path) + " "
+        xst_contents += "}"
     tools.write_to_file(build_name + ".xst", xst_contents)