Commit 36231e07 authored by mru's avatar mru

configure: require --arch and --target-os when cross-compiling

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21766 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7567d7f7
...@@ -1427,12 +1427,12 @@ yasmexe="yasm" ...@@ -1427,12 +1427,12 @@ yasmexe="yasm"
nm_opts='-g' nm_opts='-g'
# machine # machine
arch=$(uname -m) arch_default=$(uname -m)
cpu="generic" cpu="generic"
# OS # OS
target_os=$(tolower $(uname -s)) target_os_default=$(tolower $(uname -s))
host_os=$target_os host_os=$target_os_default
# configurable options # configurable options
enable avcodec enable avcodec
...@@ -1606,6 +1606,13 @@ set >> $logfile ...@@ -1606,6 +1606,13 @@ set >> $logfile
test -n "$cross_prefix" && enable cross_compile test -n "$cross_prefix" && enable cross_compile
if enabled cross_compile; then
test -n "$arch" && test -n "$target_os" ||
die "Must specify target arch and OS when cross-compiling"
fi
set_default arch target_os
ar="${cross_prefix}${ar}" ar="${cross_prefix}${ar}"
cc_default="${cross_prefix}${cc_default}" cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}" nm_default="${cross_prefix}${nm_default}"
......
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