[Libreoffice-commits] core.git: configure.ac

[jan Iversen]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa000a137ff8775aa370d6e0330d3d34323c5433
Author: jan Iversen <jani at libreoffice.org>
Date:   Thu Oct 5 12:26:25 2017 +0200

    iOS, do not cross-compile for simulator
    
    When compiling for the simulator, we should not
    cross compile, since it is only using another sdk.
    
    setting cross-compile when the architecture is the same
    causes problems with several third party libs.
    
    The unsolved problem is how to build cmdline tools.
    
    Change-Id: Ida0b31bb12f6eadca413eb6e1874553adb8be6cd

diff --git a/configure.ac b/configure.ac
index 3e197436cdcb..057c5ef2db26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3075,7 +3075,7 @@ if test "$_os" = "WINNT"; then
         BITNESS_OVERRIDE=64
     fi
 fi
-if test "$_os" = "iOS"; then
+if test "$_os" = "iOS" -a "$host_cpu" = "arm64"; then
     cross_compiling="yes"
 fi