Browse Source
fix extern prefix detection when cross compiling.
Patch by Michael Kostylev: mik niipt ru Originally committed as revision 12486 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
Michael Kostylev
Benoit Fouet
17 years ago
1 changed files with 3 additions and 1 deletions
Unified View
Diff Options
-
+3 -1configure
+ 3
- 1
configure
View File
| @@ -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" | |||||
| 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 | |||||
| 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 '""' | ||||