From c76c79a238d44764f25f446cac8621b389d24924 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Sun, 31 May 2015 03:07:16 +0400 Subject: [PATCH] Change output of abicheck.sh Besides the symbol name field also keep the field for the symbol type as outputted by nm. --- lib/abicheck.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/abicheck.sh b/lib/abicheck.sh index 74e5c537c5..1e66ac4f65 100755 --- a/lib/abicheck.sh +++ b/lib/abicheck.sh @@ -29,7 +29,7 @@ if [[ "$1" == "--generate" ]]; then rm -f $expected_abi_file for library in $file_mask; do # NOTE: don't use -C option as otherwise cut won't work correctly - nm $nm_options $library | cut -d ' ' -f 3 | sort >>$expected_abi_file + nm $nm_options $library | cut -d ' ' -f 2,3 | sort >>$expected_abi_file done echo "Expected wxWidgets ABI generated in \"$expected_abi_file\"..." @@ -53,7 +53,7 @@ elif [[ -z "$1" ]]; then rm -f $actual_abi_file for library in $file_mask; do # NOTE: don't use -C option as otherwise cut won't work correctly - nm $nm_options $library | cut -d ' ' -f 3 | sort >>$actual_abi_file + nm $nm_options $library | cut -d ' ' -f 2,3 | sort >>$actual_abi_file done result=`diff -u $expected_abi_file $actual_abi_file`