Don't uppercase toolchain in toolchain_env_var. Fixes amaranth-lang#728.

adamgreig · Nov 13, 2022 · 9ec544d · 9ec544d
1 parent db24a14
commit 9ec544d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/amaranth/_toolchain/__init__.py b/amaranth/_toolchain/__init__.py
@@ -13,6 +13,10 @@ def tool_env_var(name):
     return name.upper().replace("-", "_").replace("+", "X")
 
 
+def toolchain_env_var(name):
+    return name.replace("-", "_").replace("+", "X")
+
+
 def _get_tool(name):
     return os.environ.get(tool_env_var(name), name)
 

diff --git a/amaranth/build/plat.py b/amaranth/build/plat.py
@@ -70,11 +70,11 @@ def iter_files(self, *suffixes):
 
     @property
     def _deprecated_toolchain_env_var(self):
-        return f"NMIGEN_ENV_{tool_env_var(self.toolchain)}"
+        return f"NMIGEN_ENV_{toolchain_env_var(self.toolchain)}"
 
     @property
     def _toolchain_env_var(self):
-        return f"AMARANTH_ENV_{tool_env_var(self.toolchain)}"
+        return f"AMARANTH_ENV_{toolchain_env_var(self.toolchain)}"
 
     def build(self, elaboratable, name="top",
               build_dir="build", do_build=True,