mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
Fix cross-compilation: autodetect correct nm tool
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28046 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5e2bec3344
commit
e5fc5f99e9
12
configure
vendored
12
configure
vendored
@ -422,6 +422,7 @@ Miscellaneous options:
|
|||||||
--cc=COMPILER C compiler to build MPlayer [gcc]
|
--cc=COMPILER C compiler to build MPlayer [gcc]
|
||||||
--host-cc=COMPILER C compiler for tools needed while building [gcc]
|
--host-cc=COMPILER C compiler for tools needed while building [gcc]
|
||||||
--as=ASSEMBLER assembler to build MPlayer [as]
|
--as=ASSEMBLER assembler to build MPlayer [as]
|
||||||
|
--nm=NM nm tool to build MPlayer [nm]
|
||||||
--yasm=YASM Yasm assembler to build MPlayer [yasm]
|
--yasm=YASM Yasm assembler to build MPlayer [yasm]
|
||||||
--ar=AR librarian to build MPlayer [ar]
|
--ar=AR librarian to build MPlayer [ar]
|
||||||
--ranlib=RANLIB ranlib to build MPlayer [ranlib]
|
--ranlib=RANLIB ranlib to build MPlayer [ranlib]
|
||||||
@ -508,6 +509,7 @@ _cc=cc
|
|||||||
_ar=ar
|
_ar=ar
|
||||||
test "$CC" && _cc="$CC"
|
test "$CC" && _cc="$CC"
|
||||||
_as=auto
|
_as=auto
|
||||||
|
_nm=auto
|
||||||
_yasm=yasm
|
_yasm=yasm
|
||||||
_runtime_cpudetection=no
|
_runtime_cpudetection=no
|
||||||
_cross_compile=auto
|
_cross_compile=auto
|
||||||
@ -807,6 +809,9 @@ for ac_option do
|
|||||||
--as=*)
|
--as=*)
|
||||||
_as=`echo $ac_option | cut -d '=' -f 2`
|
_as=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
|
--nm=*)
|
||||||
|
_nm=`echo $ac_option | cut -d '=' -f 2`
|
||||||
|
;;
|
||||||
--yasm=*)
|
--yasm=*)
|
||||||
_yasm=`echo $ac_option | cut -d '=' -f 2`
|
_yasm=`echo $ac_option | cut -d '=' -f 2`
|
||||||
;;
|
;;
|
||||||
@ -1551,6 +1556,11 @@ if test "$_as" = auto ; then
|
|||||||
test -z "$_as" && _as=as
|
test -z "$_as" && _as=as
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$_nm" = auto ; then
|
||||||
|
_nm=`$_cc -print-prog-name=nm`
|
||||||
|
test -z "$_nm" && _nm=nm
|
||||||
|
fi
|
||||||
|
|
||||||
# XXX: this should be ok..
|
# XXX: this should be ok..
|
||||||
_cpuinfo="echo"
|
_cpuinfo="echo"
|
||||||
|
|
||||||
@ -2269,7 +2279,7 @@ cat > $TMPC << EOF
|
|||||||
int ff_extern;
|
int ff_extern;
|
||||||
EOF
|
EOF
|
||||||
cc_check -c || die "Symbol mangling check failed."
|
cc_check -c || die "Symbol mangling check failed."
|
||||||
sym=$(nm -P -g $TMPEXE)
|
sym=$($_nm -P -g $TMPEXE)
|
||||||
extern_prefix=${sym%%ff_extern*}
|
extern_prefix=${sym%%ff_extern*}
|
||||||
_def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
|
_def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
|
||||||
echores $extern_prefix
|
echores $extern_prefix
|
||||||
|
Loading…
Reference in New Issue
Block a user