From f490652153498b6184c6589263212b3b3326900b Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 28 Jan 2021 21:15:02 +0100 Subject: mac: allow cross compiling with host/build x86_64-apple-macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apple silicon supports to cross compile without special build-tools/full cross-compiling setup, so just always pass the build/host for firebird. firebird and nss don't recognize the -macos specifier, so substitute it by -darwin to make those happy… Change-Id: I953317fc87da2a20dc91acd88c8528796c3b2a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110093 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110065 Reviewed-by: Adolfo Jayme Barrientos --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 07d56b0785a6..42158d2613b2 100644 --- a/configure.ac +++ b/configure.ac @@ -8360,7 +8360,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then JAVAINC="$JAVAINC -I$JAVA_HOME/include" ;; - darwin*) + darwin*|macos*) if test -d "$JAVA_HOME/include/darwin"; then JAVAINC="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin" else @@ -11178,7 +11178,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; AC_MSG_RESULT([yes]) else case "$build_os" in - darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) + darwin*|macos*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) x_GNUCP=[\#] GNUCP='' AC_MSG_RESULT([no gnucp found - using the system's cp command]) -- cgit