diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 13:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 13:39:32 +0200 |
| commit | e8fc91e22a608eecccdeb612f91a0998e486426d (patch) | |
| tree | 6651a99cc870f10954a0f87f99f1f9689175c627 /configure | |
| parent | f45a840907c26d77e6d20880d07dedc0f4af44c3 (diff) | |
| parent | 4936ef6492f640e1606c6507f2c4e495164d3974 (diff) | |
| download | ffmpeg-e8fc91e22a608eecccdeb612f91a0998e486426d.tar.gz | |
Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'
* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
configure: Handle armcc 5.0
Conflicts:
configure
See: db55365d0f938ee93ed660a14c07f10f2a66dd10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -3227,10 +3227,10 @@ probe_cc(){ _cflags_speed='-fast' _cflags_size='-O1' _flags_filter=ccc_flags - elif $_cc --vsn 2>/dev/null | grep -Eq "ARM C/C[+][+] Compiler|Component: ARM 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" \ @@ -4949,6 +4949,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 |