mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 15:53:08 +00:00
Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'
* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f': configure: Include the armcc build number in the compiler identification Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
40a820d6d8
2
configure
vendored
2
configure
vendored
@ -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" \
|
||||
|
Loading…
Reference in New Issue
Block a user