diff options
| author | Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> | 2008-05-03 13:51:44 +0900 |
|---|---|---|
| committer | Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> | 2008-05-03 13:51:44 +0900 |
| commit | 141ba1cad8e6598a2466e7e2976c6a12285df619 (patch) | |
| tree | 2ee0fc2bc9c5545d050e018b27c6464c4ebbf1fb /cpu | |
| parent | ea638951acead7f1086c908c0b9f086beab82a22 (diff) | |
| download | u-boot-141ba1cad8e6598a2466e7e2976c6a12285df619.zip u-boot-141ba1cad8e6598a2466e7e2976c6a12285df619.tar.gz u-boot-141ba1cad8e6598a2466e7e2976c6a12285df619.tar.bz2 | |
[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker
Current trick to pick up GNU assembler minor version uses a dot(.) as a
delimiter, and take the second field to obtain minor version number. But
as can be expected, this doesn't work with a version string which has
dots more than needs.
Here's an example:
$ mips-linux-gnu-as --version | grep 'GNU assembler'
GNU assembler (Sourcery G++ Lite 4.2-129) 2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | cut -d. -f2
2-129) 2
$
This patch restricts the version format to 2.XX.XX... This will work
in most cases.
$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+'
2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2
18
$
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mips/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mips/config.mk b/cpu/mips/config.mk index b505a42..a173c54 100644 --- a/cpu/mips/config.mk +++ b/cpu/mips/config.mk @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # -v=$(shell $(AS) --version |grep "GNU assembler" |cut -d. -f2) +v=$(shell $(AS) --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2) MIPSFLAGS:=$(shell \ if [ "$v" -lt "14" ]; then \ echo "-mcpu=4kc"; \ |