diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-03-30 22:52:09 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-30 22:52:09 +0200 |
| commit | b18d76a1c45dd14417d2ba06b4e69e534984ba3f (patch) | |
| tree | b227bcf49f456b479a6a9734ab1473846b68e7ca | |
| parent | 4e8893b87489849d8294e9787e070a62b6669373 (diff) | |
| download | rockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.tar.gz rockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.zip | |
configure fixes.
1) use " instead of ' to expand variable
2) fix x86 arch autodetection (android toolchain doesnt use _X86_)
Change-Id: Ibf73b6ccfdb1baee3bb2f77d8f298119ecbfe16c
| -rwxr-xr-x | tools/configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure index a7076236d0..b682cbd223 100755 --- a/tools/configure +++ b/tools/configure | |||
| @@ -237,7 +237,7 @@ simcc () { | |||
| 237 | 237 | ||
| 238 | GCCOPTS="$GCCOPTS -fno-builtin -g" | 238 | GCCOPTS="$GCCOPTS -fno-builtin -g" |
| 239 | GCCOPTIMIZE='' | 239 | GCCOPTIMIZE='' |
| 240 | LDOPTS='$LDOPTS -lm' # button-sdl.c uses sqrt() | 240 | LDOPTS="$LDOPTS -lm" # button-sdl.c uses sqrt() |
| 241 | sigaltstack="" | 241 | sigaltstack="" |
| 242 | fibers="" | 242 | fibers="" |
| 243 | endian="" # endianess of the dap doesnt matter here | 243 | endian="" # endianess of the dap doesnt matter here |
| @@ -3686,7 +3686,7 @@ if [ -z "$arch" ]; then | |||
| 3686 | arch_version="$(echo $cpp_defines | sed s,\ ,\\n,g | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')" | 3686 | arch_version="$(echo $cpp_defines | sed s,\ ,\\n,g | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')" |
| 3687 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then | 3687 | elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then |
| 3688 | arch="mips" # FIXME: autodetect version (32 or 64) | 3688 | arch="mips" # FIXME: autodetect version (32 or 64) |
| 3689 | elif [ -n "$(echo $cpp_defines | grep -w _X86_)" ]; then | 3689 | elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then |
| 3690 | arch="x86" | 3690 | arch="x86" |
| 3691 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then | 3691 | elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then |
| 3692 | arch="amd64" | 3692 | arch="amd64" |