From 65da905c15f6c16479d731ac0fa45b7fcc8314a0 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sun, 4 Aug 2019 14:12:02 +0000
Subject: [PATCH] vendor.xilinx_spartan_3_6: always use -w for map/par/bitgen.

-w stands for "override output file", and supplying user options
should not remove it.
---
 nmigen/vendor/xilinx_spartan_3_6.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nmigen/vendor/xilinx_spartan_3_6.py b/nmigen/vendor/xilinx_spartan_3_6.py
index fd9ce2b..4a44ffd 100644
--- a/nmigen/vendor/xilinx_spartan_3_6.py
+++ b/nmigen/vendor/xilinx_spartan_3_6.py
@@ -138,21 +138,24 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform):
         r"""
         {{get_tool("map")}}
             {{verbose("-detail")}}
-            {{get_override("map_opts")|default(["-w"])|options}}
+            {{get_override("map_opts")|default([])|options}}
+            -w
             -o {{name}}_map.ncd
             {{name}}.ngd
             {{name}}.pcf
         """,
         r"""
         {{get_tool("par")}}
-            {{get_override("par_opts")|default(["-w"])|options}}
+            {{get_override("par_opts")|default([])|options}}
+            -w
             {{name}}_map.ncd
             {{name}}_par.ncd
             {{name}}.pcf
         """,
         r"""
         {{get_tool("bitgen")}}
-            {{get_override("bitgen_opts")|default(["-w"])|options}}
+            {{get_override("bitgen_opts")|default([])|options}}
+            -w
             -g Binary:Yes
             {{name}}_par.ncd
             {{name}}.bit
-- 
2.30.2