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 /external/nss | |
| 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 'external/nss')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index ef2ae95d7a5f..fb68da65adff 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)" \ |