Kaydet (Commit) 142d527a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Make NSS build also as 64-bit ARM code for iOS

Change-Id: I03cda6ca1886a3cfad87cc438282eeea8c2a5299
üst 1f14417b
......@@ -61,6 +61,8 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter IOS,$(OS)),\
$(if $(filter arm64,$(CC)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
$(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \
......
......@@ -77,6 +77,17 @@
endif
MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend
--- a/a/nspr/pr/include/md/_darwin.h
+++ a/a/nspr/pr/include/md/_darwin.h
@@ -26,6 +26,8 @@
#define _PR_SI_ARCHITECTURE "ppc"
#elif defined(__arm__)
#define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__arm64__)
+#define _PR_SI_ARCHITECTURE "arm64"
#else
#error "Unknown CPU architecture"
#endif
--- a/a/nspr/pr/src/Makefile.in
+++ a/a/nspr/pr/src/Makefile.in
@@ -180,7 +180,7 @@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment