diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 20:35:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-06 20:56:05 +0200 |
| commit | 40a820d6d8653f604414e770fd200b4868ab87ef (patch) | |
| tree | 8275997f0e84a3e0d929925e44ce58af87f3d6af /configure | |
| parent | 5836fe20c686fa9fe6a85afe306485b312ad1698 (diff) | |
| parent | ed6d9ce914d552eeda16af857da97c4b1aea1e3f (diff) | |
| download | ffmpeg-40a820d6d8653f604414e770fd200b4868ab87ef.tar.gz | |
Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'
* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f':
configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3336,7 +3336,7 @@ probe_cc(){ 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 | sed 's/.*: //') + _ident=$($_cc --vsn | grep -i build | head -n1 | sed 's/.*: //') armcc_conf="$PWD/armcc.conf" $_cc --arm_linux_configure \ --arm_linux_config_file="$armcc_conf" \ |