From e9975587bf2fa6cfcc82db438ca2b938f07e5cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Nguyen?= <jf@jfng.fr>
Date: Mon, 15 May 2023 15:34:44 +0200
Subject: [PATCH] build.plat: replace -+ characters in _all_toolchain_env_vars.

Mixed-case variables are allowed since af7c1144, but '-' or '+' must be
replaced to avoid invalid names (e.g. "$AMARANTH_ENV_oss-cad-suite").
---
 amaranth/build/plat.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/amaranth/build/plat.py b/amaranth/build/plat.py
index b19510f..c8b0d05 100644
--- a/amaranth/build/plat.py
+++ b/amaranth/build/plat.py
@@ -76,7 +76,10 @@ class Platform(ResourceManager, metaclass=ABCMeta):
     # TODO(amaranth-0.5): remove
     @property
     def _all_toolchain_env_vars(self):
-        return (f"AMARANTH_ENV_{self.toolchain}", self._toolchain_env_var,)
+        return (
+            f"AMARANTH_ENV_{self.toolchain.replace('-', '_').replace('+', 'X')}",
+            self._toolchain_env_var,
+        )
 
     def build(self, elaboratable, name="top",
               build_dir="build", do_build=True,