diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-02-26 12:35:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-02-26 12:36:07 +0200 |
| commit | dee6cbbc1aa16f1f51d7880d6e622146e3baf21d (patch) | |
| tree | 1b90f1d366a2c79262e32bde6546448a21bbc8f8 | |
| parent | starmath: drop a lurking space in the tooltip (diff) | |
| download | core-dee6cbbc1aa16f1f51d7880d6e622146e3baf21d.tar.gz core-dee6cbbc1aa16f1f51d7880d6e622146e3baf21d.zip | |
Enable configuring for Android cross-compilation on OS X, too
The build fails in harfbuzz, though, some ICU problem.
Change-Id: I5071a26b1cc0f6524f6b2af8740d915209727381
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 2bd85d5f72d5..bd7eba52ebb1 100644 --- a/configure.ac +++ b/configure.ac @@ -365,19 +365,29 @@ if test -n "$with_android_ndk"; then # (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if # all objects have been built with debug information.) toolchain_system='*' - if test $build_os = linux-gnu; then - ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/linux-x86/bin - ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/linux-x86 - if test $build_cpu = x86_64; then - if test -d $ANDROID_COMPILER_DIR/prebuilt/linux-x86_64; then - ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/linux-x86_64/bin - fi - if test -d $ANDROID_BINUTILS_DIR/prebuilt/linux-x86_64; then - ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/linux-x86_64 - fi + case $build_os in + linux-gnu*) + ndk_build_os=linux + ;; + darwin*) + ndk_build_os=darwin + ;; + *) + AC_MSG_ERROR([We only support building for Android from Linux or OS X]) + ;; + esac + + ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86/bin + ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/$ndk_build_os-x86 + if test $build_cpu = x86_64; then + if test -d $ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64; then + ANDROID_COMPILER_BIN=$ANDROID_COMPILER_DIR/prebuilt/$ndk_build_os-x86_64/bin + fi + if test -d $ANDROID_BINUTILS_DIR/prebuilt/$ndk_build_os-x86_64; then + ANDROID_BINUTILS_PREBUILT_ROOT=$ANDROID_BINUTILS_DIR/prebuilt/$ndk_build_os-x86_64 fi - ANDROID_BINUTILS_BIN=$ANDROID_BINUTILS_PREBUILT_ROOT/bin fi + ANDROID_BINUTILS_BIN=$ANDROID_BINUTILS_PREBUILT_ROOT/bin # This stays empty if there is just one version of the toolchain in the NDK ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR= |