From 97eb5671bbf9e29559ac6ce5aa25f473ce65cadb Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 6 Jun 2013 13:47:52 -0700 Subject: [PATCH] Update the configure script to pass --enable-64bit --- configure | 11 +++++++---- src/support/nss/nss | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 05f223e53a8..5fffd078556 100755 --- a/configure +++ b/configure @@ -506,11 +506,14 @@ do if [ $i = "rust-azure" ]; then CONFIGURE_ARGS="--enable-skia" fi - if [ $i = mozjs ]; then - if [ ! -z $CFG_ENABLE_DEBUG ]; then - CONFIGURE_ARGS="--enable-debug" - fi + if [ $i = "nspr" ]; then + CONFIGURE_ARGS="--enable-64bit" + fi + if [ $i = mozjs ]; then + if [ ! -z $CFG_ENABLE_DEBUG ]; then + CONFIGURE_ARGS="--enable-debug" fi + fi if [ -f ${CONFIGURE_SCRIPT} ] then diff --git a/src/support/nss/nss b/src/support/nss/nss index 725cf233061..9d997ba0d0e 160000 --- a/src/support/nss/nss +++ b/src/support/nss/nss @@ -1 +1 @@ -Subproject commit 725cf233061c9598fc7c27cdc1d6278742396a48 +Subproject commit 9d997ba0d0ec7b25c27ad3c8a77587e78ae9f9df