external/nss/ExternalProject_nss.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit f49894406f7f7418c0fb85af42aa1aa25a9e4f36 Author: Tor Lillqvist <[email protected]> AuthorDate: Sat Jul 4 15:10:38 2020 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Sep 18 22:00:21 2020 +0200 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 <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103019 Tested-by: Jenkins CollaboraOffice <[email protected]> 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 \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
