aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-05-29 12:19:55 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-05-30 14:05:22 -0700
commit0af3bbf953a6765f5fdef32cec7a93fc74a2a338 (patch)
treebe3da4fe3c908bfada0733f170b9e5b984c3f24a
parenta1d12897e8fa51db776403f7855b937597a26470 (diff)
downloadservo-0af3bbf953a6765f5fdef32cec7a93fc74a2a338.tar.gz
servo-0af3bbf953a6765f5fdef32cec7a93fc74a2a338.zip
Add NSS and NSPR to the build
-rwxr-xr-xconfigure2
-rw-r--r--mk/sub.mk2
m---------src/support/nss/nspr0
m---------src/support/nss/nss0
4 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index e6dddb7ea3a..05f223e53a8 100755
--- a/configure
+++ b/configure
@@ -411,6 +411,8 @@ CFG_SUBMODULES="\
support/libparserutils/libparserutils \
support/netsurfcss/libcss \
support/netsurfcss/rust-netsurfcss \
+ support/nss/nspr \
+ support/nss/nss \
support/opengles/rust-opengles \
support/sharegl/sharegl \
support/skia/skia \
diff --git a/mk/sub.mk b/mk/sub.mk
index e8bf4d7c67a..80bcb003826 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -21,6 +21,8 @@ NATIVE_BUILDS += \
libwapcaplet \
mozjs \
skia \
+ nss \
+ nspr \
$(NULL)
# NOTE: the make magic can only compute transitive build dependencies,
diff --git a/src/support/nss/nspr b/src/support/nss/nspr
-Subproject 27b456e7d5a0f75381ab34b961f6779097007af
+Subproject 8219c5c5137b94ae93cfb4afc1dc10a94384e1c
diff --git a/src/support/nss/nss b/src/support/nss/nss
-Subproject 3d07e85a597ce9c5c1ec80f85983efcb26aa58e
+Subproject 725cf233061c9598fc7c27cdc1d6278742396a4