From a704b1b218ca97ab59da8d84ae0f51481170a225 Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Fri, 3 Feb 2023 06:09:22 +0000
Subject: [PATCH] vendor.xilinx: update build script template for prjxray.

---
 amaranth/vendor/xilinx.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/amaranth/vendor/xilinx.py b/amaranth/vendor/xilinx.py
index 407a731..9a10dec 100644
--- a/amaranth/vendor/xilinx.py
+++ b/amaranth/vendor/xilinx.py
@@ -1,10 +1,10 @@
+import re
 from abc import abstractproperty
 
 from ..hdl import *
 from ..lib.cdc import ResetSynchronizer
 from ..build import *
 
-import re
 
 __all__ = ["XilinxPlatform"]
 
@@ -505,8 +505,9 @@ class XilinxPlatform(TemplatedPlatform):
         "build_{{name}}.sh": r"""
             # {{autogenerated}}
             set -e{{verbose("x")}}
-            [ -n "${{platform._deprecated_toolchain_env_var}}" ] && . "${{platform._deprecated_toolchain_env_var}}"
-            [ -n "${{platform._toolchain_env_var}}" ] && . "${{platform._toolchain_env_var}}"
+            {% for var in platform._all_toolchain_env_vars %}
+            [ -n "${{var}}" ] && . "${{var}}"
+            {% endfor %}
             : ${DB_DIR:=/usr/share/nextpnr/prjxray-db}
             : ${CHIPDB_DIR:=/usr/share/nextpnr/xilinx-chipdb}
             {{emit_commands("sh")}}