From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50F42138351 for ; Sun, 26 Jan 2020 13:44:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C6A9E089C; Sun, 26 Jan 2020 13:44:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC8B1E0886 for ; Sun, 26 Jan 2020 13:44:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D6BD34E1A8 for ; Sun, 26 Jan 2020 13:44:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D55D8F for ; Sun, 26 Jan 2020 13:44:09 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1580046099.9eaff8513518c35d9dfd8ade68460a912f76f62e.slyfox@gentoo> Subject: [gentoo-commits] proj/gcc-config:master commit in: / X-VCS-Repository: proj/gcc-config X-VCS-Files: gcc-config X-VCS-Directories: / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9eaff8513518c35d9dfd8ade68460a912f76f62e X-VCS-Branch: master Date: Sun, 26 Jan 2020 13:44:09 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa9f344d-0a2b-4f58-9b69-cbda6a8b4dbb X-Archives-Hash: 218227ae2207f7cd0daf590c1f0abc6f commit: 9eaff8513518c35d9dfd8ade68460a912f76f62e Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jan 26 13:41:39 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jan 26 13:41:39 2020 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=9eaff851 gcc-config: distinguish errors between bad profile and bad compiler The distinction is useful when making tests: compiler is often missing when config is present. Signed-off-by: Sergei Trofimovich gentoo.org> gcc-config | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gcc-config b/gcc-config index 8b4fd20..f03a46a 100755 --- a/gcc-config +++ b/gcc-config @@ -1083,14 +1083,17 @@ if [[ ${DOIT} != "get_current_profile" ]] ; then CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*} fi - if [[ ! -d ${EROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then + if [[ ! -d ${EROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] ; then CC_COMP_VERSION=${CC_COMP_VERSION%-*} fi - if [[ ! -d ${EROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] || \ - [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]] - then - eerror "${argv0}: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2 + if [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]] ; then + eerror "${argv0}: Profile '${GCC_ENV_D}/${CC_COMP}' does not exist" 1>&2 + #exit 1 + fi + + if [[ ! -d ${EROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]] ; then + eerror "${argv0}: Did not find compiler at '${EROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION}'" 1>&2 #exit 1 fi fi