diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-13 20:07:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-13 20:08:19 +0300 |
| commit | 142d527a6be9d21631253477cf06c03f54657ef9 (patch) | |
| tree | f927f8334b901b2aaa758289d16972cab3dd3fb2 /external/nss | |
| parent | 1f14417bb0418adcdb267632f064ccde151792af (diff) | |
Make NSS build also as 64-bit ARM code for iOS
Change-Id: I03cda6ca1886a3cfad87cc438282eeea8c2a5299
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 | ||||
| -rw-r--r-- | external/nss/nss-ios.patch | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3bf851b2fa12..9bff2c55d3f0 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -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)) \ diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch index 8e883f97d84b..0601573d0b23 100644 --- a/external/nss/nss-ios.patch +++ b/external/nss/nss-ios.patch @@ -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 @@ |