Merge commit 'bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a'

* commit 'bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a':
  makedef: Pass EXTERN_PREFIX from configure to makedef

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-16 13:12:59 -03:00
2 changed files with 4 additions and 29 deletions
+1 -27
View File
@@ -58,33 +58,7 @@ fi
IFS='
'
# Determine if we're building for x86 or x86_64 and
# set the symbol prefix accordingly.
prefix=""
if [ -n "$NM" ]; then
case $ARCH in
*86)
prefix="_"
;;
*)
;;
esac
else
arch=$(dumpbin -headers ${libname} |
tr '\t' ' ' |
grep '^ \+.\+machine \+(.\+)' |
head -1 |
sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/')
if [ "${arch}" = "x86" ]; then
prefix="_"
else
if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then
echo "Unknown machine type." >&2
exit 1
fi
fi
fi
prefix="$EXTERN_PREFIX"
started=0
regex="none"