From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8889C1384B4 for ; Mon, 30 Nov 2015 03:15:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B841121C003; Mon, 30 Nov 2015 03:15:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA0E521C02E for ; Mon, 30 Nov 2015 03:14:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96724340666 for ; Mon, 30 Nov 2015 03:14:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBDE9CB0 for ; Mon, 30 Nov 2015 03:14:56 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1448853270.3295c1c8647c047dd22475665f30be0ce0b58aa7.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:crossdev commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-v6.42.eclass X-VCS-Directories: eclass/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 3295c1c8647c047dd22475665f30be0ce0b58aa7 X-VCS-Branch: crossdev Date: Mon, 30 Nov 2015 03:14:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f0ee10e0-6112-4d1e-befb-99e8478c930d X-Archives-Hash: c7d8ea0c49276db9a520be7728ecad43 commit: 3295c1c8647c047dd22475665f30be0ce0b58aa7 Author: Ian Stakenvicius gentoo org> AuthorDate: Sun Nov 29 22:57:43 2015 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Mon Nov 30 03:14:30 2015 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=3295c1c8 set --build=chost when not cross-compiling and set --host only when cross-compiling eclass/mozconfig-v6.42.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/mozconfig-v6.42.eclass b/eclass/mozconfig-v6.42.eclass index ce5d26c..5a26067 100644 --- a/eclass/mozconfig-v6.42.eclass +++ b/eclass/mozconfig-v6.42.eclass @@ -249,7 +249,13 @@ mozconfig_config() { # of --build, and --target intstead of --host. # Note, mozilla also has --build but it does not do what you think it does. mozconfig_annotate '' --target="${CHOST}" - mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + if [[ "${CBUILD:-${CHOST}}" == "${CHOST}" ]]; then + # apply old --build setting when not cross-compiling + mozconfig_annotate '' --build="${CHOST}" + else + # set --host when cross-compiling as otherwise it won't subconfigure + mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + fi if use gstreamer ; then mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0