summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-01-03 21:15:17 +0000
committerThomas Martitz <kugel@rockbox.org>2012-01-03 21:15:17 +0000
commit84f651f9b6b509224d9b8a57872f846ac4a0c646 (patch)
tree84c7d4654b42078273a7e835dc3074b285f3e00c
parent0bc64a6bb358ae2c5568ec4747d1cea06c42ab59 (diff)
downloadrockbox-84f651f9b6b509224d9b8a57872f846ac4a0c646.tar.gz
rockbox-84f651f9b6b509224d9b8a57872f846ac4a0c646.tar.bz2
rockbox-84f651f9b6b509224d9b8a57872f846ac4a0c646.zip
android: Adjust gcc/linker cmdline. Fixes build with ndk r7.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31542 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xtools/configure8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/configure b/tools/configure
index fbb10c4858..88c3738203 100755
--- a/tools/configure
+++ b/tools/configure
@@ -685,14 +685,12 @@ androidcc () {
PATH=$PATH:$gccprefix/bin
prefixtools $gcctarget
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
- GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
+ GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
--sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
- GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \
- --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
- LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog"
+ GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
+ LDOPTS="-shared -ldl -llog --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm $LDOPTS"
endian="little"
SHARED_LDFLAG="-shared"
- SHARED_CFLAGS=''
}
whichadvanced () {