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 101D91382C5 for ; Tue, 1 Jun 2021 22:20:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47A50E079E; Tue, 1 Jun 2021 22:20:15 +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 2CEFDE079E for ; Tue, 1 Jun 2021 22:20:15 +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 E4837335DB0 for ; Tue, 1 Jun 2021 22:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45BB978E for ; Tue, 1 Jun 2021 22:20:12 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1622585989.3927c242bb4a54dba21c689dc15657c5c13490ae.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.52.1.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 3927c242bb4a54dba21c689dc15657c5c13490ae X-VCS-Branch: master Date: Tue, 1 Jun 2021 22:20:12 +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: aceb5ca2-ee7f-46ed-a18d-c7805abb8f1e X-Archives-Hash: 2dc485833ec4d0d3e51f3f7dc50456f1 commit: 3927c242bb4a54dba21c689dc15657c5c13490ae Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jun 1 22:19:16 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jun 1 22:19:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3927c242 dev-lang/rust: make sysroot detection more robust Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.52.1.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild index 42d6f2b17da..efa716a08b9 100644 --- a/dev-lang/rust/rust-1.52.1.ebuild +++ b/dev-lang/rust/rust-1.52.1.ebuild @@ -279,10 +279,14 @@ src_configure() { local rust_stage0_root if use system-bootstrap; then - rust_stage0_root="$(rustc --print sysroot)" + local printsysroot + printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")" + rust_stage0_root="${printsysroot}" else rust_stage0_root="${WORKDIR}"/rust-stage0 fi + # in case of prefix it will be already prefixed, as --print sysroot returns full path + [[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory" rust_target="$(rust_abi)"