From 36a437a445e9404f358360f0a8d31351a2855d3c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 30 Sep 2016 19:04:48 -0500 Subject: [PATCH] fix nm call the prefix was missing a '-', i.e. arm-linux-gnueabinm was being called. This also sets -e in run.sh to catch this sort of errors. --- ci/run.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 206b2e9..e07c82f 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -1,3 +1,5 @@ +set -e + # Test our implementation case $1 in thumb*) @@ -29,7 +31,7 @@ case $1 in esac # Look out for duplicated symbols when we include the compiler-rt (C) implementation -PREFIX=$(echo $1 | sed -e 's/unknown-//') +PREFIX=$(echo $1 | sed -e 's/unknown-//')- case $1 in armv7-*) PREFIX=arm-linux-gnueabihf- @@ -55,8 +57,10 @@ case $TRAVIS_OS_NAME in esac # NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it -$PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib | \ - sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __' +stdout=$($PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib) + +set +e +echo $stdout | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __' if test $? = 0; then exit 1