aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-03-05 21:20:01 +0000
committerMåns Rullgård <mans@mansr.com>2009-03-05 21:20:01 +0000
commit313c46a61004a589f44094d6b3ed9b9be933b936 (patch)
tree11e35c671d12e87e0b666fcf35360a361891f843 /configure
parenta3398feb26c4a19324bdc16dfbd221532016b3a4 (diff)
downloadffmpeg-313c46a61004a589f44094d6b3ed9b9be933b936.tar.gz
Compile .S files with $(AS), set it in configure
Assembler files using the GNU syntax need to be processed by gcc, whichever compiler is used for C files. Originally committed as revision 17827 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index 90f03c227f..f030528688 100755
--- a/configure
+++ b/configure
@@ -178,6 +178,7 @@ show_help(){
echo " --target-exec=CMD command to run executables on target"
echo " --target-path=DIR path to view of build directory on target"
echo " --nm=NM use nm tool"
+ echo " --as=AS use assembler AS [$as_default]"
echo " --cc=CC use C compiler CC [$cc_default]"
echo " --host-cc=HOSTCC use host C compiler HOSTCC"
echo " --host-cflags=HCFLAGS use HCFLAGS when compiling for host"
@@ -938,6 +939,7 @@ PATHS_LIST='
CMDLINE_SET="
$PATHS_LIST
arch
+ as
build_suffix
cc
cpu
@@ -1140,6 +1142,7 @@ shlibdir_default="$libdir_default"
# toolchain
ar="ar"
+as_default="gcc"
cc_default="gcc"
host_cc_default="gcc"
ln_s="ln -sf"
@@ -1306,6 +1309,7 @@ set >> $logfile
test -n "$cross_prefix" && enable cross_compile
ar="${cross_prefix}${ar}"
+as_default="${cross_prefix}${as_default}"
cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
ranlib="${cross_prefix}${ranlib}"
@@ -1313,7 +1317,7 @@ strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include"
-set_default cc nm sysinclude
+set_default as cc nm sysinclude
enabled cross_compile || host_cc_default=$cc
set_default host_cc
@@ -2329,6 +2333,7 @@ echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak
echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
echo "CC=$cc" >> config.mak
+echo "AS=$as" >> config.mak
echo "YASM=$yasmexe" >> config.mak
echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak