From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gH9cHE8aiGargwEAe85BDQ:P1 (envelope-from ) for ; Fri, 05 Jul 2024 16:07:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gH9cHE8aiGargwEAe85BDQ (envelope-from ) for ; Fri, 05 Jul 2024 18:07:43 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720195663; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=dwyF9BNmYJx3idhv205WDNcz9DEAYTO3T/IAO9vGuEc=; b=foOCG3XsDrk05QsG7Wlz5k5qmMqr65bKbQMU+O/88mzSob+BI5tNQZNY5I2xER3EqkzlMZ 5FaZAEnDMbev+H4y+3ZP8k7nNKYHfU11g3s+JOfVDO1WxkWTt/dznAuKlktWMPNp3rNk50 HZAbGLpkF2p/EHRI53ygUGB+ookHE2J30U22jS3MEqG70SHTMS7IZ5LA2sxI7Ix5kG8mEc JqDPhddl5LlmybIjmXuITjv/17VrAGA8kGpvwOyJtXUZni8Y2MbN6er13LR+QsfQwA81zc lSK8TAusmGvf+z2P+r7TT3k/FiXKtijlxlWYqyNhHEUX0ujLHwIkrQRvvzsaLA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720195663; a=rsa-sha256; cv=none; b=r4QLe3Iii8XDY9zMJ0ecCyZ7S5i9D0u2ehHJP4YN5BR/Kv6n23kLjyoItRBs3cd6MVDF9E Dr5EHW9ChPrLh6cQA49cA0We7SjGlofJw8y6JpDuYhqiVTWILalI6N364cK9UiNFCftXVU gH0M+AqPrpecg3XDgvhe9J6kCfCpVmEChv55uCZMHhsTl0zGe4iF3U9aYrrpmQkOWob9N2 Xijz22yMHp6NgYSLJGqXhATiHoZnFWdqwMkq6UzU6V69eNl/OZSDZLnreAbnnevQHtF4C3 W/D3rXo57y1N5LwOJ62HaMfQU4LIy5y7Ce45ceNVw92c6de6dxZaqFfDClxqkA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 51B4B62AEF for ; Fri, 5 Jul 2024 18:07:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPlSg-0005eO-00; Fri, 05 Jul 2024 12:07:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPlSe-0005dy-Un for guix-patches@gnu.org; Fri, 05 Jul 2024 12:07:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPlSe-00044P-MF for guix-patches@gnu.org; Fri, 05 Jul 2024 12:07:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPlSh-0003Of-HH; Fri, 05 Jul 2024 12:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 16:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70985@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 70985-submit@debbugs.gnu.org id=B70985.172019560312991 (code B ref 70985); Fri, 05 Jul 2024 16:07:03 +0000 Received: (at 70985) by debbugs.gnu.org; 5 Jul 2024 16:06:43 +0000 Received: from localhost ([127.0.0.1]:44851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSM-0003NO-LT for submit@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPlSK-0003Mw-RM for 70985@debbugs.gnu.org; Fri, 05 Jul 2024 12:06:41 -0400 Received: from localhost (nat-inria-guest-32-gw-01-bso.bordeaux.inria.fr [194.199.1.32]) by mira.cbaines.net (Postfix) with ESMTPSA id 2038A27BBEC for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 17:06:07 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id eae7c300 for <70985@debbugs.gnu.org>; Fri, 5 Jul 2024 16:06:05 +0000 (UTC) From: Christopher Baines Date: Fri, 5 Jul 2024 18:06:02 +0200 Message-ID: <0c15a853521c4a9cfa8f4c3558e3aee9fb0a9d91.1720195563.git.mail@cbaines.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> References: <9f11c96f25ba0f8f0c63ad3d6f5d6295035e7cc7.1720195563.git.mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 51B4B62AEF X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.89 X-Spam-Score: -4.89 X-TUID: r1AP8jghHBJc * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against cross-libc returning #f. Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29 --- gnu/packages/rust.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a385344473..f1de34b277 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -73,7 +73,9 @@ (define-module (gnu packages rust) #:use-module (ice-9 match) #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) ;; This is the hash for the empty file, and the reason it's relevant is not ;; the most obvious. @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation (modify-inputs (package-native-inputs base-rust) (prepend (cross-gcc target #:libc (cross-libc target)) - (cross-libc target) + (or (cross-libc target) ; could be #f + (raise (condition + (&package-unsupported-target-error + (package (libc-for-target target)) + (target target))))) (cross-binutils target))))) (properties `((hidden? . #t) -- 2.45.2