From: Mike Frysinger Date: Thu, 2 Dec 2004 19:41:40 +0000 (+0000) Subject: dont need to run env-update and make CHOST resolution faster X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bed315829267f75be88874e535662f5e0df2204;p=gentoo.git dont need to run env-update and make CHOST resolution faster --- diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index e316864fd39d..55e77744bc64 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -5,11 +5,11 @@ MD5 77032215f7b1d5e6564ce3252f0629ee binutils-config-1.0.ebuild 599 MD5 40a8b3fbd8febefda7e27a41434e1e7c ChangeLog 354 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.0 0 -MD5 550f6f79cb02fd88747031d3e8b089f7 files/binutils-config-1.0 4332 +MD5 89f444ee1aafa7cbc86ceea992fcb3c3 files/binutils-config-1.0 4353 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBrBG1roRuSHgZdywRAr7wAJsH6hakC92iX8T12Uxw5VkbjohDIgCcCUb6 -3qgkDZUPjKYlNugYcx5e2oM= -=6L8t +iD8DBQFBr3ARroRuSHgZdywRAhBaAJ9yb++3QJH59a6U6SCaf2rIBQNtPQCfTyP7 +D5uqWP4pXp7JYMFj/LlwTgs= +=ps1o -----END PGP SIGNATURE----- diff --git a/sys-devel/binutils-config/files/binutils-config-1.0 b/sys-devel/binutils-config/files/binutils-config-1.0 index 397afb756c3c..1b31521d71df 100755 --- a/sys-devel/binutils-config/files/binutils-config-1.0 +++ b/sys-devel/binutils-config/files/binutils-config-1.0 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.0,v 1.2 2004/11/30 06:22:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.0,v 1.3 2004/12/02 19:41:40 vapier Exp $ # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=version for TARGET @@ -69,7 +69,6 @@ switch_profile() { ln -sf "${INCPATH}/${x}" "${dstinc}/${x}" done - [ "${ROOT}" = "/" ] && env-update >& /dev/null eend 0 echo "CURRENT=${VER}" > "${ENV_D}/config-${TARGET}" @@ -188,7 +187,13 @@ for x in "$@" ; do esac done -[ "${DOIT}" != "list_profiles" ] && HOST="$(portageq envvar CHOST)" +if [ "${DOIT}" != "list_profiles" ] ; then + if [ -z "${CHOST}" ] ; then + HOST="$(portageq envvar CHOST)" + else + HOST="${CHOST}" + fi +fi [ -z "${PROFILE}" ] && PROFILE="${HOST}" eval ${DOIT}