# HG changeset patch # User Olaf Wintermann # Date 1565725021 -7200 # Node ID 135c0599f8839db067ed30a79f6416cf9d993136 # Parent ebdecbbb2f797b69ca3684b46508124f07866762 fix toolchain script diff -r ebdecbbb2f79 -r 135c0599f883 test/make/toolchain.sh --- a/test/make/toolchain.sh Tue Aug 13 21:01:48 2019 +0200 +++ b/test/make/toolchain.sh Tue Aug 13 21:37:01 2019 +0200 @@ -63,7 +63,7 @@ return 0 } -printf "detect toolchain... " +printf "detect C compiler... " for COMP in $C_COMPILERS do @@ -152,7 +152,7 @@ TOOLCHAIN_LD=$TOOLCHAIN_CC -if [ -z TOOLCHAIN_NAME ]; then +if [ -z "$TOOLCHAIN_NAME" ]; then TOOLCHAIN_DETECTION_ERROR="error" else cat >> $TEMP_DIR/config.mk << __EOF__ @@ -164,7 +164,8 @@ fi echo "LD = ${TOOLCHAIN_LD}" >> $TEMP_DIR/config.mk - if [ -e "make/${TOOLCHAIN_NAME}.mk" ]; then + cat "make/${TOOLCHAIN_NAME}.mk" > /dev/null 2>&1 + if [ $? -eq 0 ]; then echo "include \$(BUILD_ROOT)/make/${TOOLCHAIN_NAME}.mk" >> $TEMP_DIR/config.mk fi fi