diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2015-04-19 18:13:19 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2015-04-19 18:14:23 +0200 |
| commit | 2e5810217477d9e87ea3c34ab210c588ba38e01e (patch) | |
| tree | d1b0e475d362c67af5bfaf758f464abfaa0bd43e /tools/configure | |
| parent | d8ee5fcfc4282b4ed2cc002e3c11ce9bf5c44572 (diff) | |
| download | rockbox-2e5810217477d9e87ea3c34ab210c588ba38e01e.tar.gz rockbox-2e5810217477d9e87ea3c34ab210c588ba38e01e.zip | |
configure: harden arch autodetected a bit
Some arm gcc versions have multiple cpp symbols beginning with
__ARM_ARCH, but want only the one that contains the arch version.
Change-Id: I6792572e29200fc4e62ba07bdd63dc722356c2bb
Diffstat (limited to 'tools/configure')
| -rwxr-xr-x | tools/configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure index 13cd5995b2..ec8350212a 100755 --- a/tools/configure +++ b/tools/configure | |||
| @@ -4249,10 +4249,10 @@ if [ -z "$arch" ]; then | |||
| 4249 | elif [ -n "$(echo $cpp_defines | grep -w __arm__)" ]; then | 4249 | elif [ -n "$(echo $cpp_defines | grep -w __arm__)" ]; then |
| 4250 | arch="arm" | 4250 | arch="arm" |
| 4251 | # cpp defines like "#define __ARM_ARCH_4TE__ 1" (where we want to extract the 4) | 4251 | # cpp defines like "#define __ARM_ARCH_4TE__ 1" (where we want to extract the 4) |
| 4252 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')" | 4252 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,' | grep -v __ARM_ARCH)" |
| 4253 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then | 4253 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then |
| 4254 | arch="mips" | 4254 | arch="mips" |
| 4255 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep _MIPS_ARCH_MIPS | sed -e 's,.*\([0-9][0-9]\).*,\1,')" | 4255 | arch_version="$(echo $cpp_defines | tr ' ' '\012' | grep _MIPS_ARCH_MIPS | sed -e 's,.*\([0-9][0-9]\).*,\1,' | grep -v _MIPS_ARCH_MIPS)" |
| 4256 | elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then | 4256 | elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then |
| 4257 | arch="x86" | 4257 | arch="x86" |
| 4258 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then | 4258 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then |