diff options
| author | Martin Storsjö <martin@martin.st> | 2014-04-18 23:40:59 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-04-19 12:49:20 +0300 |
| commit | 4936ef6492f640e1606c6507f2c4e495164d3974 (patch) | |
| tree | 1b55bb03c2525cd859ac88aa4a8a20d7128c16f5 /configure | |
| parent | 32d05934abc7427bb90380a4c1ab20a15fd7d821 (diff) | |
| download | ffmpeg-4936ef6492f640e1606c6507f2c4e495164d3974.tar.gz | |
configure: Handle armcc 5.0
The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2766,10 +2766,10 @@ probe_cc(){ _cflags_speed='-fast' _cflags_size='-O1' _flags_filter=ccc_flags - elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then + elif $_cc --vsn 2>/dev/null | grep -Eq "ARM (C/C\+\+ )?Compiler"; then test -d "$sysroot" || die "No valid sysroot specified." _type=armcc - _ident=$($_cc --vsn | head -n1) + _ident=$($_cc --vsn | head -n1 | sed 's/.*: //') armcc_conf="$PWD/armcc.conf" $_cc --arm_linux_configure \ --arm_linux_config_file="$armcc_conf" \ @@ -4290,6 +4290,8 @@ elif enabled cparser; then add_cflags -Wno-missing-variable-declarations add_cflags -Wno-empty-statement elif enabled armcc; then + add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat + add_cflags -W${armcc_opt},--diag_suppress=3036 # using . as system include dir # 2523: use of inline assembler is deprecated add_cflags -W${armcc_opt},--diag_suppress=2523 add_cflags -W${armcc_opt},--diag_suppress=1207 |