# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1255445365 -3600
# Node ID 03fece2d315801e29a240122943cd676f0907068
# Parent  83f4b4db085cfd0df5a7783f7fd898dff77edffc
Fix Bug 476 by improving the check for the RVCT version of armasm

diff -r 83f4b4db085c -r 03fece2d3158 toolsandutils/buildsystem/extension/base/bootstrap.mk
--- a/toolsandutils/buildsystem/extension/base/bootstrap.mk	Tue Feb 02 01:39:43 2010 +0200
+++ b/toolsandutils/buildsystem/extension/base/bootstrap.mk	Tue Oct 13 15:49:25 2009 +0100
@@ -77,13 +77,15 @@
 ifeq "$(CPU)" "arm"
 ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC)
 ARMASM_OUT := $(shell armasm 2>&1)
-ARMASM_OUT_4 := $(word 4,$(ARMASM_OUT))
+ARMASM_OUT_RVCT := $(wordlist 1,6,$(ARMASM_OUT))
 ARMASM_OUT_6 := $(word 6,$(ARMASM_OUT))
 
 # Use GCC toolchain if no other is available
 TOOLVER := GCC
 
-RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_4)))
+# ARM/Thumb Macro Assembler, RVCT2.2 [Build 616]
+# ARM Assembler, RVCT4.0 [Build 529]
+RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_RVCT)))
 ifeq "$(RVCTSTR)" "RVCT"
         TOOLVER := RVCT
         OP := --