diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-28 21:15:02 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-01-29 05:17:42 +0100 |
| commit | f490652153498b6184c6589263212b3b3326900b (patch) | |
| tree | 7a947da41201f9d8af7338ff769c4365c22ec14c /external | |
| parent | 9fb11584425d692136c3c83d4e02a78432738f6b (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>
(cherry picked from commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110065
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 1 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 8f8a8230227f..3e6455edb9b8 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -75,6 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --enable-shared --disable-static \ ) \ $(if $(filter MACOSX,$(OS)), \ + --build=$(subst macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM)) \ $(if $(filter 1, \ $(shell expr '$(MAC_OS_X_VERSION_MIN_REQUIRED)' \ '<' 101200)), \ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index b97ae11a515a..a9c4fcadfc95 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ CPU_ARCH=x86_64 \ - NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + NSPR_CONFIGURE_OPTS="--build=$(subst macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))") \ NSDISTMODE=copy \ $(MAKE) \ AR="$(AR)" \ |