1.1 --- a/common/bin/difflib.sh Mon Jun 25 21:37:09 2012 -0700
1.2 +++ b/common/bin/difflib.sh Tue Jul 03 16:11:12 2012 -0700
1.3 @@ -53,21 +53,27 @@
1.4 fi
1.5
1.6 if [ "`uname`" == "SunOS" ]; then
1.7 - NM=gnm
1.8 - STAT="gstat -c%s"
1.9 + if [ -f "`which gnm`" ]; then
1.10 + NM=gnm
1.11 +# Jonas 2012-05-29: solaris native nm produces radically different output than gnm
1.12 +# so if using that...we need different filter than "cut -f 2-"
1.13 +#
1.14 + elif [ -f "`which nm`" ]; then
1.15 + NM=nm
1.16 + else
1.17 + echo "No nm command found"
1.18 + exit 10
1.19 + fi
1.20 LDD=ldd
1.21 elif [ $OSTYPE == "cygwin" ]; then
1.22 NM="$VS100COMNTOOLS/../../VC/bin/amd64/dumpbin.exe"
1.23 NM_ARGS=/exports
1.24 - STAT="stat -c%s"
1.25 LDD=
1.26 elif [ "`uname`" == "Darwin" ]; then
1.27 NM=nm
1.28 - STAT="stat -f%z"
1.29 LDD="otool -L"
1.30 else
1.31 NM=nm
1.32 - STAT="stat -c%s"
1.33 LDD=ldd
1.34 fi
1.35
1.36 @@ -83,8 +89,8 @@
1.37 OLD=$(cd $(dirname $1) && pwd)/$(basename $1)
1.38 NEW=$(cd $(dirname $2) && pwd)/$(basename $2)
1.39
1.40 -OLD_SIZE=$($STAT "$OLD")
1.41 -NEW_SIZE=$($STAT "$NEW")
1.42 +OLD_SIZE=$(ls -l "$OLD" | awk '{ print $5 }')
1.43 +NEW_SIZE=$(ls -l "$NEW" | awk '{ print $5 }')
1.44
1.45 if [ $# -gt 3 ]
1.46 then
1.47 @@ -122,8 +128,8 @@
1.48 exit 0
1.49 fi
1.50
1.51 -OLD_SYMBOLS=$COMPARE_ROOT/$OLD_NAME.old
1.52 -NEW_SYMBOLS=$COMPARE_ROOT/$NEW_NAME.new
1.53 +OLD_SYMBOLS=$COMPARE_ROOT/nm.$OLD_NAME.old
1.54 +NEW_SYMBOLS=$COMPARE_ROOT/nm.$NEW_NAME.new
1.55
1.56 mkdir -p $(dirname $OLD_SYMBOLS)
1.57 mkdir -p $(dirname $NEW_SYMBOLS)
