summaryrefslogtreecommitdiff
path: root/tools/configure
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-03-30 22:52:09 +0200
committerThomas Martitz <kugel@rockbox.org>2012-03-30 22:52:09 +0200
commitb18d76a1c45dd14417d2ba06b4e69e534984ba3f (patch)
treeb227bcf49f456b479a6a9734ab1473846b68e7ca /tools/configure
parent4e8893b87489849d8294e9787e070a62b6669373 (diff)
downloadrockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.zip
rockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.tar.gz
rockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.tar.bz2
rockbox-b18d76a1c45dd14417d2ba06b4e69e534984ba3f.tar.xz
configure fixes.
1) use " instead of ' to expand variable 2) fix x86 arch autodetection (android toolchain doesnt use _X86_) Change-Id: Ibf73b6ccfdb1baee3bb2f77d8f298119ecbfe16c
Diffstat (limited to 'tools/configure')
-rwxr-xr-xtools/configure4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure
index a707623..b682cbd 100755
--- a/tools/configure
+++ b/tools/configure
@@ -237,7 +237,7 @@ simcc () {
GCCOPTS="$GCCOPTS -fno-builtin -g"
GCCOPTIMIZE=''
- LDOPTS='$LDOPTS -lm' # button-sdl.c uses sqrt()
+ LDOPTS="$LDOPTS -lm" # button-sdl.c uses sqrt()
sigaltstack=""
fibers=""
endian="" # endianess of the dap doesnt matter here
@@ -3686,7 +3686,7 @@ if [ -z "$arch" ]; then
arch_version="$(echo $cpp_defines | sed s,\ ,\\n,g | grep __ARM_ARCH | sed -e 's,.*\([0-9]\).*,\1,')"
elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then
arch="mips" # FIXME: autodetect version (32 or 64)
- elif [ -n "$(echo $cpp_defines | grep -w _X86_)" ]; then
+ elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then
arch="x86"
elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then
arch="amd64"