opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 20:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set AS to $CC by default, override with gcc only when CC is armcc

Browse Source 
Originally committed as revision 17920 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2009-03-09 22:39:49 +00:00
parent b8cc5a9fdf
commit 75800dce2b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1147,7 +1147,6 @@ shlibdir_default="$libdir_default"
# toolchain # toolchain
ar="ar" ar="ar"
as_default="gcc"
cc_default="gcc" cc_default="gcc"
host_cc_default="gcc" host_cc_default="gcc"
ln_s="ln -sf" ln_s="ln -sf"
@ -1316,7 +1315,6 @@ set >> $logfile
test -n "$cross_prefix" && enable cross_compile test -n "$cross_prefix" && enable cross_compile
ar="${cross_prefix}${ar}" ar="${cross_prefix}${ar}"
as_default="${cross_prefix}${as_default}"
cc_default="${cross_prefix}${cc_default}" cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}" nm_default="${cross_prefix}${nm_default}"
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
@ -1324,7 +1322,8 @@ strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include" sysinclude_default="${sysroot}/usr/include"
set_default as cc nm sysinclude set_default cc nm sysinclude
as_default=$cc
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
@ -1404,10 +1403,13 @@ elif $cc --vsn 2>/dev/null | grep -q RVCT; then
--configure_cpp_headers="$sysinclude" >>$logfile 2>&1 || --configure_cpp_headers="$sysinclude" >>$logfile 2>&1 ||
die "Error creating armcc configuration file." die "Error creating armcc configuration file."
cc="$cc --arm_linux_config_file=$armcc_conf --translate_gcc" cc="$cc --arm_linux_config_file=$armcc_conf --translate_gcc"
as_default="${cross_prefix}gcc"
fi fi
test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc" test -n "$cc_type" && enable $cc_type || echolog "Unknown C compiler $cc"
set_default as
if test -n "$sysroot"; then if test -n "$sysroot"; then
case "$cc_type" in case "$cc_type" in
gcc) gcc)