From patchwork Mon May 9 23:24:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 39185 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E704E27BBEA; Tue, 10 May 2022 00:24:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D4F627BBE9 for ; Tue, 10 May 2022 00:24:11 +0100 (BST) Received: from localhost ([::1]:42602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCja-0005BP-Q2 for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCjT-0005B6-LI for guix-patches@gnu.org; Mon, 09 May 2022 19:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCjT-0008Fd-D4 for guix-patches@gnu.org; Mon, 09 May 2022 19:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCjT-0003bF-6H for guix-patches@gnu.org; Mon, 09 May 2022 19:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55343] [PATCH 1/2] utils: Define 'target-x86?' predicate. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 55343@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 55343-submit@debbugs.gnu.org id=B55343.165213860713777 (code B ref 55343); Mon, 09 May 2022 23:24:03 +0000 Received: (at 55343) by debbugs.gnu.org; 9 May 2022 23:23:27 +0000 Received: from localhost ([127.0.0.1]:59719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCit-0003a5-Iq for submit@debbugs.gnu.org; Mon, 09 May 2022 19:23:27 -0400 Received: from cyberdimension.org ([80.67.179.20]:35764 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCir-0003Zw-M7 for 55343@debbugs.gnu.org; Mon, 09 May 2022 19:23:26 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id d3da63cb; Mon, 9 May 2022 23:22:37 +0000 (UTC) Received: from primarylaptop.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 4abafe96; Mon, 9 May 2022 23:22:37 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Tue, 10 May 2022 01:24:50 +0200 Message-Id: <20220509232451.30605-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220510011812.15710e0b@primarylaptop.localdomain> References: <20220510011812.15710e0b@primarylaptop.localdomain> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-x86?): New predicate. --- guix/utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) base-commit: 37e44d48baf976f6bfcd885b2e10da4ab7be4af9 diff --git a/guix/utils.scm b/guix/utils.scm index 44c46cb4a9..a9d8819770 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2018 Steve Sprang ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,6 +92,7 @@ (define-module (guix utils) target-mingw? target-x86-32? target-x86-64? + target-x86? target-arm32? target-aarch64? target-arm? @@ -683,6 +685,10 @@ (define* (target-x86-64? #:optional (target (or (%current-target-system) architecture (x86_64)?" (string-prefix? "x86_64-" target)) +(define* (target-x86? #:optional (target (or (%current-target-system) + (%current-system)))) + (or (target-x86-32? target) (target-x86-64? target))) + (define* (target-arm32? #:optional (target (or (%current-target-system) (%current-system)))) (string-prefix? "arm" target))