usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build.plat,vendor: add missing compatibility shims for NMIGEN_ENV_*.

Browse source 
These have been mistakenly omitted from commit 909a3b8b.
This commit is contained in:
whitequark 2021-12-11 11:49:47 +00:00
parent b1eba5fd82
commit 90777a65c8
6 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
amaranth/build/plat.py
View file

@ -92,7 +92,7 @@ class Platform(ResourceManager, metaclass=ABCMeta):
# may fail. # may fail.
# This is OK because even if `require_tool` succeeds, the toolchain might be broken anyway. # This is OK because even if `require_tool` succeeds, the toolchain might be broken anyway.
# The check only serves to catch common errors earlier. # The check only serves to catch common errors earlier.
if do_build and (self._deprecated_toolchain_env_var not in os.environ or if do_build and (self._deprecated_toolchain_env_var not in os.environ and
self._toolchain_env_var not in os.environ): self._toolchain_env_var not in os.environ):
for tool in self.required_tools: for tool in self.required_tools:
require_tool(tool) require_tool(tool)

5
amaranth/vendor/intel.py
View file

@ -86,6 +86,11 @@ class IntelPlatform(TemplatedPlatform):
**TemplatedPlatform.build_script_templates, **TemplatedPlatform.build_script_templates,
"build_{{name}}.sh": r""" "build_{{name}}.sh": r"""
# {{autogenerated}} # {{autogenerated}}
if [ -n "${{platform._deprecated_toolchain_env_var}}" ]; then
QUARTUS_ROOTDIR=$(dirname $(dirname "${{platform._deprecated_toolchain_env_var}}"))
# Quartus' qenv.sh does not work with `set -e`.
. "${{platform._deprecated_toolchain_env_var}}"
fi
if [ -n "${{platform._toolchain_env_var}}" ]; then if [ -n "${{platform._toolchain_env_var}}" ]; then
QUARTUS_ROOTDIR=$(dirname $(dirname "${{platform._toolchain_env_var}}")) QUARTUS_ROOTDIR=$(dirname $(dirname "${{platform._toolchain_env_var}}"))
# Quartus' qenv.sh does not work with `set -e`. # Quartus' qenv.sh does not work with `set -e`.

4
amaranth/vendor/lattice_ecp5.py
View file

@ -191,6 +191,10 @@ class LatticeECP5Platform(TemplatedPlatform):
# {{autogenerated}} # {{autogenerated}}
set -e{{verbose("x")}} set -e{{verbose("x")}}
if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi
if [ -n "${{platform._deprecated_toolchain_env_var}}" ]; then
bindir=$(dirname "${{platform._deprecated_toolchain_env_var}}")
. "${{platform._deprecated_toolchain_env_var}}"
fi
if [ -n "${{platform._toolchain_env_var}}" ]; then if [ -n "${{platform._toolchain_env_var}}" ]; then
bindir=$(dirname "${{platform._toolchain_env_var}}") bindir=$(dirname "${{platform._toolchain_env_var}}")
. "${{platform._toolchain_env_var}}" . "${{platform._toolchain_env_var}}"

13
amaranth/vendor/lattice_ice40.py
View file

@ -182,7 +182,18 @@ class LatticeICE40Platform(TemplatedPlatform):
"build_{{name}}.sh": r""" "build_{{name}}.sh": r"""
# {{autogenerated}} # {{autogenerated}}
set -e{{verbose("x")}} set -e{{verbose("x")}}
if [ -n "${{platform._toolchain_env_var}}" ]; then if [ -n "${{platform._deprecated_toolchain_env_var}}" ]; then
# LSE environment
export LD_LIBRARY_PATH=${{platform._deprecated_toolchain_env_var}}/LSE/bin/lin64:$LD_LIBRARY_PATH
export PATH=${{platform._deprecated_toolchain_env_var}}/LSE/bin/lin64:$PATH
export FOUNDRY=${{platform._deprecated_toolchain_env_var}}/LSE
# Synplify environment
export LD_LIBRARY_PATH=${{platform._deprecated_toolchain_env_var}}/sbt_backend/bin/linux/opt/synpwrap:$LD_LIBRARY_PATH
export PATH=${{platform._deprecated_toolchain_env_var}}/sbt_backend/bin/linux/opt/synpwrap:$PATH
export SYNPLIFY_PATH=${{platform._deprecated_toolchain_env_var}}/synpbase
# Common environment
export SBT_DIR=${{platform._deprecated_toolchain_env_var}}/sbt_backend
elif [ -n "${{platform._toolchain_env_var}}" ]; then
# LSE environment # LSE environment
export LD_LIBRARY_PATH=${{platform._toolchain_env_var}}/LSE/bin/lin64:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${{platform._toolchain_env_var}}/LSE/bin/lin64:$LD_LIBRARY_PATH
export PATH=${{platform._toolchain_env_var}}/LSE/bin/lin64:$PATH export PATH=${{platform._toolchain_env_var}}/LSE/bin/lin64:$PATH

4
amaranth/vendor/lattice_machxo_2_3l.py
View file

@ -55,6 +55,10 @@ class LatticeMachXO2Or3LPlatform(TemplatedPlatform):
# {{autogenerated}} # {{autogenerated}}
set -e{{verbose("x")}} set -e{{verbose("x")}}
if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi
if [ -n "${{platform._deprecated_toolchain_env_var}}" ]; then
bindir=$(dirname "${{platform._deprecated_toolchain_env_var}}")
. "${{platform._deprecated_toolchain_env_var}}"
fi
if [ -n "${{platform._toolchain_env_var}}" ]; then if [ -n "${{platform._toolchain_env_var}}" ]; then
bindir=$(dirname "${{platform._toolchain_env_var}}") bindir=$(dirname "${{platform._toolchain_env_var}}")
. "${{platform._toolchain_env_var}}" . "${{platform._toolchain_env_var}}"

2
amaranth/vendor/xilinx.py
View file

@ -129,6 +129,7 @@ class XilinxPlatform(TemplatedPlatform):
# {{autogenerated}} # {{autogenerated}}
set -e{{verbose("x")}} set -e{{verbose("x")}}
if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi
[ -n "${{platform._deprecated_toolchain_env_var}}" ] && . "${{platform._deprecated_toolchain_env_var}}"
[ -n "${{platform._toolchain_env_var}}" ] && . "${{platform._toolchain_env_var}}" [ -n "${{platform._toolchain_env_var}}" ] && . "${{platform._toolchain_env_var}}"
{{emit_commands("sh")}} {{emit_commands("sh")}}
""", """,
@ -235,6 +236,7 @@ class XilinxPlatform(TemplatedPlatform):
# {{autogenerated}} # {{autogenerated}}
set -e{{verbose("x")}} set -e{{verbose("x")}}
if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi if [ -z "$BASH" ] ; then exec /bin/bash "$0" "$@"; fi
[ -n "${{platform._deprecated_toolchain_env_var}}" ] && . "${{platform._deprecated_toolchain_env_var}}"
[ -n "${{platform._toolchain_env_var}}" ] && . "${{platform._toolchain_env_var}}" [ -n "${{platform._toolchain_env_var}}" ] && . "${{platform._toolchain_env_var}}"
{{emit_commands("sh")}} {{emit_commands("sh")}}
""", """,