virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

configure: Move the cross_prefix setting after the toolchain one

Browse Source 
Makes passing to configure
--toolchain=gcc-asan --cross-prefix=armv7a-hardfloat-linux-gnueabi-
work as intended.
This commit is contained in:
Luca Barbato 2014-04-07 00:47:42 +02:00
parent 85b3b1c4ba
commit 82b6e45116
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -2494,15 +2494,6 @@ if enabled cross_compile; then
die "Must specify target arch and OS when cross-compiling" die "Must specify target arch and OS when cross-compiling"
fi fi
ar_default="${cross_prefix}${ar_default}"
cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}"
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include"
case "$toolchain" in case "$toolchain" in
clang-asan) clang-asan)
cc_default="clang" cc_default="clang"
@ -2587,6 +2578,15 @@ case "$toolchain" in
;; ;;
esac esac
ar_default="${cross_prefix}${ar_default}"
cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
pkg_config_default="${cross_prefix}${pkg_config_default}"
ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include"
set_default arch cc pkg_config sysinclude target_exec target_os set_default arch cc pkg_config sysinclude target_exec target_os
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc