From 84f651f9b6b509224d9b8a57872f846ac4a0c646 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 3 Jan 2012 21:15:17 +0000 Subject: 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 --- tools/configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tools/configure') 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 () { -- cgit v1.2.3