diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-04-07 00:47:42 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-02-26 15:11:16 +0100 |
| commit | 82b6e451161f19ab90bfb9565b710021caf5dcbd (patch) | |
| tree | 141b21dc48b2b10569927c7c8ff57f2e9ecc7144 | |
| parent | 85b3b1c4ba7af9c2658442b0aafd27d613e1854b (diff) | |
| download | ffmpeg-streaming-82b6e451161f19ab90bfb9565b710021caf5dcbd.zip ffmpeg-streaming-82b6e451161f19ab90bfb9565b710021caf5dcbd.tar.gz | |
configure: Move the cross_prefix setting after the toolchain one
Makes passing to configure
--toolchain=gcc-asan --cross-prefix=armv7a-hardfloat-linux-gnueabi-
work as intended.
| -rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -2494,15 +2494,6 @@ if enabled cross_compile; then die "Must specify target arch and OS when cross-compiling" 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 clang-asan) cc_default="clang" @@ -2587,6 +2578,15 @@ case "$toolchain" in ;; 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 enabled cross_compile || host_cc_default=$cc set_default host_cc |
