Skip to content

Commit 36a437a

Browse files
author
Jorge Aparicio
committed
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.
1 parent 960f7a8 commit 36a437a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

ci/run.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set -e
2+
13
# Test our implementation
24
case $1 in
35
thumb*)
@@ -29,7 +31,7 @@ case $1 in
2931
esac
3032

3133
# Look out for duplicated symbols when we include the compiler-rt (C) implementation
32-
PREFIX=$(echo $1 | sed -e 's/unknown-//')
34+
PREFIX=$(echo $1 | sed -e 's/unknown-//')-
3335
case $1 in
3436
armv7-*)
3537
PREFIX=arm-linux-gnueabihf-
@@ -55,8 +57,10 @@ case $TRAVIS_OS_NAME in
5557
esac
5658

5759
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
58-
$PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib | \
59-
sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'
60+
stdout=$($PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib)
61+
62+
set +e
63+
echo $stdout | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'
6064

6165
if test $? = 0; then
6266
exit 1

0 commit comments

Comments
 (0)