Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB7E9112D3 for ; Sun, 13 Jul 2014 13:00:46 +0000 (UTC) Received: (qmail 13925 invoked by uid 500); 13 Jul 2014 13:00:46 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 13862 invoked by uid 500); 13 Jul 2014 13:00:46 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 13849 invoked by uid 99); 13 Jul 2014 13:00:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Jul 2014 13:00:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5EC5F919A5A; Sun, 13 Jul 2014 13:00:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Sun, 13 Jul 2014 13:00:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] couch commit: updated refs/heads/1994-merge-rcouch to 7ad4bc6 use uname p instead of the arch command fix RCOUCH-21 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/0aa924aa Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/0aa924aa Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/0aa924aa Branch: refs/heads/1994-merge-rcouch Commit: 0aa924aa8fdce4ded5f0cc4cb9414e2d585861e5 Parents: 74e57b5 Author: benoitc Authored: Sun Feb 16 20:59:52 2014 +0100 Committer: benoitc Committed: Sun Jul 13 14:59:53 2014 +0200 ---------------------------------------------------------------------- build_spidermonkey.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0aa924aa/build_spidermonkey.sh ---------------------------------------------------------------------- diff --git a/build_spidermonkey.sh b/build_spidermonkey.sh index 68dc813..9607716 100755 --- a/build_spidermonkey.sh +++ b/build_spidermonkey.sh @@ -48,7 +48,7 @@ CXX=g++ PATCH=patch case "$SYSTEM" in Linux) - ARCH=`arch 2>/dev/null` + ARCH=`(uname -p) 2>/dev/null` ;; FreeBSD|OpenBSD|NetBSD) ARCH=`(uname -p) 2>/dev/null` @@ -84,7 +84,7 @@ build_nspr() NSPR_CONFIGURE_ENV="" case "$SYSTEM" in Linux) - ARCH=`arch 2>/dev/null` + ARCH=`(uname -p) 2>/dev/null` if [ "$ARCH" = "x86_64" ]; then NSPR_CONFIGURE_ENV="--enable-64bit" fi