diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-24 17:37:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-25 13:45:38 +0100 |
| commit | b1d500e8a4eadb72d0e574f77ebf33fbc5701900 (patch) | |
| tree | 78907f7f5bec943a3cb717dc28a72e4eb50b735e /external | |
| parent | aa95913dd8e505123ba8974d5de27ac0ec928cce (diff) | |
Drop support for $host_os = 'macos*', in addition to 'darwin*'
...which had originally been added with baab4f890c8ac99d1b8dab5790fbb7ab949100ab
"Initial WIP steps for building for macOS on Apple Silicon" for unclear reasons
(just stating "use 'darwin' (or 'macos')" in the commit message), and then
further improved with 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2 "mac: allow cross
compiling with host/build x86_64-apple-macos".
But it turns out that manually specifying --host or --build =...-macos rather
than =...-darwin has issues as discussed in the comments at
<https://gerrit.libreoffice.org/c/core/+/130353> "icu: override platform flags
for MacOS build", and which can hopefully be avoided by not allowing =...-macos
in the first place, and rather forcing people to specify =...-darwin.
Change-Id: Ib100b7270250083eba4146430e967073a8cbca46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130505
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 1 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 0d5534aeccbb..9c28d5641ef0 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -77,7 +77,6 @@ $(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 9213d76b713f..b9f953f3649b 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -62,8 +62,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ - CPU_ARCH=x86_64 \ - NSPR_CONFIGURE_OPTS="--build=$(subst macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))") \ + CPU_ARCH=x86_64) \ NSDISTMODE=copy \ $(MAKE) \ AR="$(AR)" \ |