Commit 2e3f4edd authored by benoit's avatar benoit

fix extern prefix detection when cross compiling.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12486 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fee6b651
...@@ -888,6 +888,7 @@ bindir='$(PREFIX)/bin' ...@@ -888,6 +888,7 @@ bindir='$(PREFIX)/bin'
# toolchain # toolchain
cc="gcc" cc="gcc"
ar="ar" ar="ar"
nm="nm"
ranlib="ranlib" ranlib="ranlib"
make="make" make="make"
strip="strip" strip="strip"
...@@ -1315,6 +1316,7 @@ LDFLAGS="$FFLDFLAGS $LDFLAGS" ...@@ -1315,6 +1316,7 @@ LDFLAGS="$FFLDFLAGS $LDFLAGS"
test -n "$cross_prefix" && enable cross_compile test -n "$cross_prefix" && enable cross_compile
cc="${cross_prefix}${cc}" cc="${cross_prefix}${cc}"
ar="${cross_prefix}${ar}" ar="${cross_prefix}${ar}"
nm="${cross_prefix}${nm}"
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}" strip="${cross_prefix}${strip}"
...@@ -1494,7 +1496,7 @@ fi ...@@ -1494,7 +1496,7 @@ fi
check_cc <<EOF || die "Symbol mangling check failed." check_cc <<EOF || die "Symbol mangling check failed."
int ff_extern; int ff_extern;
EOF EOF
sym=$(nm -P -g $TMPO) sym=$($nm -P -g $TMPO)
extern_prefix=${sym%%ff_extern*} extern_prefix=${sym%%ff_extern*}
check_asm inline_asm '""' check_asm inline_asm '""'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment