diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-08-26 12:52:10 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-08-26 12:52:10 +0000 |
| commit | bcafde6174697e8605d2680d6896553302acb4dd (patch) | |
| tree | 8f938b045b2bdeaa69ed63506e322f2a971b9705 | |
| parent | 133cc989ddd71c2c9a0d956dc7c0056cd6b8eef7 (diff) | |
| download | ffmpeg-bcafde6174697e8605d2680d6896553302acb4dd.tar.gz | |
configure: select warning suppression syntax based on armcc version
Release 4.1 changed the flag used to pass options through the gcc
translation layer. Detect which version is used, and choose the
appropriate flag.
Originally committed as revision 24945 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1845,6 +1845,7 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then --configure_sysroot="$sysroot" \ --configure_cpp_headers="$sysinclude" >>$logfile 2>&1 || die "Error creating armcc configuration file." + $cc --vsn | grep -q RVCT && armcc_opt=rvct || armcc_opt=armcc cc="$cc --arm_linux_config_file=$armcc_conf --translate_gcc" as_default="${cross_prefix}gcc" CC_DEPFLAGS='-MMD' @@ -2877,8 +2878,8 @@ elif enabled clang; then check_cflags -Qunused-arguments elif enabled armcc; then # 2523: use of inline assembler is deprecated - add_cflags -Wrvct,--diag_suppress=2523 - add_cflags -Wrvct,--diag_suppress=1207 + add_cflags -W${armcc_opt},--diag_suppress=2523 + add_cflags -W${armcc_opt},--diag_suppress=1207 elif enabled tms470; then add_cflags -pds=824 -pds=837 fi |