[FFmpeg-cvslog] r21766 - trunk/configure

mru subversion
Fri Feb 12 00:57:52 CET 2010


Author: mru
Date: Fri Feb 12 00:57:52 2010
New Revision: 21766

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

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Feb 12 00:40:47 2010	(r21765)
+++ trunk/configure	Fri Feb 12 00:57:52 2010	(r21766)
@@ -1427,12 +1427,12 @@ yasmexe="yasm"
 nm_opts='-g'
 
 # machine
-arch=$(uname -m)
+arch_default=$(uname -m)
 cpu="generic"
 
 # OS
-target_os=$(tolower $(uname -s))
-host_os=$target_os
+target_os_default=$(tolower $(uname -s))
+host_os=$target_os_default
 
 # configurable options
 enable avcodec
@@ -1606,6 +1606,13 @@ set >> $logfile
 
 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}"
 cc_default="${cross_prefix}${cc_default}"
 nm_default="${cross_prefix}${nm_default}"



More information about the ffmpeg-cvslog mailing list