summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-09-23 10:48:58 +0000
committerMåns Rullgård <mans@mansr.com>2009-09-23 10:48:58 +0000
commit6a0d5493b300b15aba9bb2d9fedbe6b39a86781e (patch)
treeb0c092d69c9852c6a7d2b8f304a08cd4bfb61940
parent96651e790cbaf5f0002e02f81606658198d07d18 (diff)
ARM: improve armcc detection
Apparently some versions of armcc do not identify as RVCT. This changes the test to a string used by all versions. Originally committed as revision 19985 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 06f7a0ced4..0f7e53121e 100755
--- a/configure
+++ b/configure
@@ -1536,7 +1536,7 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then
DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M'
debuglevel=3
add_ldflags -Wl,-z,now # calls to libots crash without this
-elif $cc --vsn 2>/dev/null | grep -q RVCT; then
+elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
test -d "$sysroot" || die "No valid sysroot specified."
cc_type=armcc
cc_version="AV_STRINGIFY(__ARMCC_VERSION)"