README.cross | 4 ---- configure.in | 16 ++++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-)
New commits: commit 3dd05633bf29dcad613d6787c2a57ea2db2216f7 Author: Tor Lillqvist <[email protected]> Date: Thu Aug 9 23:57:15 2012 +0300 Can use simpler autogen.lastrun now Change-Id: I66101c025469e9df72c331b981e48893f6a5ac3d diff --git a/README.cross b/README.cross index 891b6a5..6b24da2 100644 --- a/README.cross +++ b/README.cross @@ -342,16 +342,12 @@ will probably drive you insane. Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X 10.8 with Xcode 4.4.1: -CC_FOR_BUILD=xcrun clang -arch i386 -CXX_FOR_BUILD=xcrun clang++ -arch i386 ---build=x86_64-apple-darwin11 --disable-zenity --enable-debug --enable-werror --with-android-ndk=/Users/tml/android-ndk-r8b --with-android-ndk-toolchain-version=4.6 --with-android-sdk=/Users/tml/android-sdk-macosx ---with-build-platform-configure-options=--with-macosx-sdk=10.8 --with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8 --with-distro=LibreOfficeAndroid --without-doxygen --without-helppack-integration commit 13df2ce5c4ebeb270146678956b97a5a95053a55 Author: Tor Lillqvist <[email protected]> Date: Thu Aug 9 23:42:17 2012 +0300 Don't check $cross_compiling until it has been detected more reliably Change-Id: I00b2a29d30bee2e71b0a04790b6de48bbbacae8a diff --git a/configure.in b/configure.in index 0f56209..0436625 100644 --- a/configure.in +++ b/configure.in @@ -66,14 +66,6 @@ dnl do this before argument processing to allow for platform dependent defaults dnl =================================================================== AC_CANONICAL_HOST -if test "$cross_compiling" = "yes"; then - CROSS_COMPILING=YES -else - CROSS_COMPILING= - BUILD_TYPE="$BUILD_TYPE NATIVE" -fi -AC_SUBST(CROSS_COMPILING) - AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well AC_PATH_PROG(GREP, grep) @@ -2761,6 +2753,14 @@ AC_SUBST(ENABLE_DIRECTX) AC_SUBST(DISABLE_ACTIVEX) AC_SUBST(DISABLE_ATL) +if test "$cross_compiling" = "yes"; then + CROSS_COMPILING=YES +else + CROSS_COMPILING= + BUILD_TYPE="$BUILD_TYPE NATIVE" +fi +AC_SUBST(CROSS_COMPILING) + dnl =================================================================== dnl Test the gcc version dnl =================================================================== _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
