diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-17 13:54:25 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-17 18:08:15 +0200 |
| commit | 18f4ff23179620e834aa3ebd83a2e15c2f77cbe1 (patch) | |
| tree | 3387af70fde0488107d986be90b01dd216762868 | |
| parent | eed2695cd5d63bdaf8b02c5cbf3a7e4017e18173 (diff) | |
Recommend to use NDK r7b
Drop compiler options -fexceptions -frtti for Android, I hope they are
taken care of by the makefilery where needed. At least either
-fexceptions or -fno-exceptions is used for each C++ compilation as
far as I know. Not so sure about RTTI, let's see.
| -rw-r--r-- | README.cross | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/README.cross b/README.cross index 2acd497c8496..d2a8b140fe4a 100644 --- a/README.cross +++ b/README.cross @@ -322,7 +322,7 @@ Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X: CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 ---with-android-ndk=/Users/tml/android-ndk-r7 +--with-android-ndk=/Users/tml/android-ndk-r7b --with-android-sdk=/Users/tml/android-sdk-macosx --build=x86_64-apple-darwin11 --disable-zenity @@ -338,7 +338,7 @@ And here is an autogen.lastrun for Android when cross-compiling from Linux: CC_FOR_BUILD=ccache gcc CXX_FOR_BUILD=ccache g++ ---with-android-ndk=/home/tml/android-ndk-r7 +--with-android-ndk=/home/tml/android-ndk-r7b --with-android-sdk=/home/tml/android-sdk-linux_x86 --with-ant-home=/opt/apache-ant-1.8.2 --build=x86_64-unknown-linux-gnu diff --git a/configure.in b/configure.in index 2459b76baf1d..486d061e758f 100644 --- a/configure.in +++ b/configure.in @@ -111,7 +111,7 @@ if test -n "$with_android_ndk"; then ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a" test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc $ANDROIDCFLAGS" - test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -fexceptions -frtti" + test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include" fi AC_SUBST(ANDROID_NDK_HOME) |