yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 00:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

all.sh: with --no-armcc, don't call armcc from output_env.sh

Browse Source 
When not running armcc, don't try to invoke armcc at all, not even to
report its version.
This commit is contained in:
Gilles Peskine 2018-03-21 08:35:07 +01:00
parent 6013004fa9
commit 53038ebecc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/output_env.sh
View File

@ -47,13 +47,15 @@ print_version()
print_version "uname" "-a" ""
echo
: ${ARMC5_CC:=armcc}
print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2"
echo
if [ "${RUN_ARMCC:-1}" -ne 0 ]; then
: "${ARMC5_CC:=armcc}"
print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2"
echo
: ${ARMC6_CC:=armclang}
print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2"
echo
: "${ARMC6_CC:=armclang}"
print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2"
echo
fi
print_version "arm-none-eabi-gcc" "--version" "gcc-arm not found!" "head -n 1"
echo

2
tests/scripts/all.sh
View File

@ -447,7 +447,7 @@ msg "info: output_env.sh"
OPENSSL="$OPENSSL" OPENSSL_LEGACY="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_CLI" \
GNUTLS_SERV="$GNUTLS_SERV" GNUTLS_LEGACY_CLI="$GNUTLS_LEGACY_CLI" \
GNUTLS_LEGACY_SERV="$GNUTLS_LEGACY_SERV" ARMC5_CC="$ARMC5_CC" \
ARMC6_CC="$ARMC6_CC" scripts/output_env.sh
ARMC6_CC="$ARMC6_CC" RUN_ARMCC="$RUN_ARMCC" scripts/output_env.sh
msg "test: recursion.pl" # < 1s
tests/scripts/recursion.pl library/*.c