diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-07-04 15:10:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-09-18 22:00:21 +0200 |
| commit | f49894406f7f7418c0fb85af42aa1aa25a9e4f36 (patch) | |
| tree | 394d7addcca067d1289f4c783582f39364c7158f /external | |
| parent | 7c0bc17fb5871ffaa9497ab9e0917fe0c00c0e98 (diff) | |
Remove leftovers for OS X on PowerPC
Change-Id: Id9d553e58635c2fa7414108467ff7d22f5c74c41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97980
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103019
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 7fc1d74abcb3..9b02cb3006c4 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -41,12 +41,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ $(if $(filter iOS,$(OS)),$(if $(filter ARM64,$(CPUNAME)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ + MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ NSS_USE_SYSTEM_SQLITE=1) \ $(if $(filter LINUX,$(OS)),$(if $(ENABLE_DBGUTIL),,BUILD_OPT=1)) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ - $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ |