diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-28 21:15:02 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-28 23:11:59 +0100 |
| commit | 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2 (patch) | |
| tree | 2fef29a4ac55694c962a90654b1dd621195a5866 /configure.ac | |
| parent | b8a968d83dec047bed47c1d7a6fac1b14dc7651b (diff) | |
mac: allow cross compiling with host/build x86_64-apple-macos
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 <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index aad842d03768..75f5543703f2 100644 --- a/configure.ac +++ b/configure.ac @@ -8332,7 +8332,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 @@ -11123,7 +11123,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]) |