mirror of https://github.com/openXC7/prjxray.git
utils/environment: protect against unintentionally wrongly set env var XRAY_VIVADO (#1870)
This commit is contained in:
commit
58a39ef1a3
|
|
@ -49,7 +49,7 @@ export XRAY_VIVADO="${XRAY_UTILS_DIR}/vivado.sh"
|
||||||
# Verify an approved version is in use
|
# Verify an approved version is in use
|
||||||
export XRAY_VIVADO_SETTINGS="${XRAY_VIVADO_SETTINGS:-/opt/Xilinx/Vivado/2017.2/settings64.sh}"
|
export XRAY_VIVADO_SETTINGS="${XRAY_VIVADO_SETTINGS:-/opt/Xilinx/Vivado/2017.2/settings64.sh}"
|
||||||
# Vivado v2017.2 (64-bit)
|
# Vivado v2017.2 (64-bit)
|
||||||
if [ $(${XRAY_VIVADO} -h |grep Vivado |cut -d\ -f 2) != "v2017.2" ] ; then
|
if [ "$(${XRAY_VIVADO} -h |grep Vivado |cut -d\ -f 2)" != "v2017.2" ] ; then
|
||||||
echo "Requires Vivado 2017.2. See https://github.com/SymbiFlow/prjxray/issues/14"
|
echo "Requires Vivado 2017.2. See https://github.com/SymbiFlow/prjxray/issues/14"
|
||||||
# Can't exit since sourced script
|
# Can't exit since sourced script
|
||||||
# Trash a key environment variable to preclude use
|
# Trash a key environment variable to preclude use
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue