diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
| commit | c301199804f5beb7ef803abfa84e04d9351efb3f (patch) | |
| tree | 991cfa7a033d7fc76e5ea76ca2a10363b1bc5271 /configure.in | |
| parent | bc7110a06be5304e00f8ed94c278f5b9a476c002 (diff) | |
| parent | 71fb61b77a548ac8b0b499f7c6039e197c994842 (diff) | |
Merge branch 'feature/android'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 0f5ba8a49af5..b96b081fcfb6 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,8 @@ if test -n "$with_android_ndk"; then test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip 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" + + # Note that letting this set CC and CXX means ccache won't be used 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" fi @@ -3135,6 +3137,7 @@ if test "$cross_compiling" = "yes"; then tar cf - \ bin/repo-list.in \ build_env.in \ + android/Bootstrap/local.properties.in \ android/qa/sc/local.properties.in \ android/qa/desktop/local.properties.in \ config.guess \ @@ -10895,7 +10898,7 @@ else echo > config_host.mk.last fi -AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list build_env android/qa/sc/local.properties android/qa/desktop/local.properties]) +AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list build_env android/Bootstrap/local.properties android/qa/sc/local.properties android/qa/desktop/local.properties]) AC_OUTPUT # touch the config timestamp file set_soenv.stamp |