Fix `-vlgincdir` for xst.
authorTim 'mithro' Ansell <me@mith.ro>
Tue, 18 Dec 2018 05:11:14 +0000 (21:11 -0800)
committerTim 'mithro' Ansell <me@mith.ro>
Tue, 18 Dec 2018 05:11:14 +0000 (21:11 -0800)
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.
```

litex/build/xilinx/ise.py

index 9bdaaa5c2694351c9f798ff9c4f9835cc1921d7e..39ff5b4898cb285a3f4daa75abffcaf2287d2547 100644 (file)
@@ -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)