env: fix environment export

pulp-platform · Jan 13, 2025 · 2f010aa · 2f010aa
1 parent 590cbf0
commit 2f010aa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/env/astral-env.sh b/env/astral-env.sh
@@ -8,14 +8,16 @@ ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 # If at IIS, set up appropriate questa version.
 if test -f /etc/iis.version; then
   export QUESTA=questa-2023.4-zr
-  export VLOG="$QUESTA vlog"
-  export VLIB="$QUESTA vlib"
-  export VMAP="$QUESTA vmap"
-  export VCOM="$QUESTA vcom"
-  export VOPT="$QUESTA vopt"
-  export VSIM="$QUESTA vsim"
-  export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
 fi
 
+export QUESTA=questa-2023.4-zr
+export VLOG="$QUESTA vlog"
+export VLIB="$QUESTA vlib"
+export VMAP="$QUESTA vmap"
+export VCOM="$QUESTA vcom"
+export VOPT="$QUESTA vopt"
+export VSIM="$QUESTA vsim"
+export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
+
 source "$ROOTD/pulp-runtime/configs/astral-cluster.sh"
 source "$ROOTD/scripts/vsim.sh"
diff --git a/env/carfield-env.sh b/env/carfield-env.sh
@@ -8,14 +8,16 @@ ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 # If at IIS, set up appropriate questa version.
 if test -f /etc/iis.version; then
   export QUESTA=questa-2023.4-zr
-  export VLOG="$QUESTA vlog"
-  export VLIB="$QUESTA vlib"
-  export VMAP="$QUESTA vmap"
-  export VCOM="$QUESTA vcom"
-  export VOPT="$QUESTA vopt"
-  export VSIM="$QUESTA vsim"
-  export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
 fi
 
+export QUESTA=questa-2023.4-zr
+export VLOG="$QUESTA vlog"
+export VLIB="$QUESTA vlib"
+export VMAP="$QUESTA vmap"
+export VCOM="$QUESTA vcom"
+export VOPT="$QUESTA vopt"
+export VSIM="$QUESTA vsim"
+export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
+
 source "$ROOTD/pulp-runtime/configs/carfield-cluster.sh"
 source "$ROOTD/scripts/vsim.sh"
diff --git a/env/env.sh b/env/env.sh
@@ -8,14 +8,15 @@ ROOTD=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 # If at IIS, set up appropriate questa version.
 if test -f /etc/iis.version; then
   export QUESTA=questa-2023.4-zr
-  export VLOG="$QUESTA vlog"
-  export VLIB="$QUESTA vlib"
-  export VMAP="$QUESTA vmap"
-  export VCOM="$QUESTA vcom"
-  export VOPT="$QUESTA vopt"
-  export VSIM="$QUESTA vsim"
-  export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
 fi
 
+export VLOG="$QUESTA vlog"
+export VLIB="$QUESTA vlib"
+export VMAP="$QUESTA vmap"
+export VCOM="$QUESTA vcom"
+export VOPT="$QUESTA vopt"
+export VSIM="$QUESTA vsim"
+export PULP_RUNTIME_GCC_TOOLCHAIN=/usr/pack/riscv-1.0-kgf/pulp-gcc-1.0.16
+
 source "$ROOTD/pulp-runtime/configs/pulp_cluster.sh"
 source "$ROOTD/scripts/vsim.sh"