Message ID | 20190821085455.18508-58-m.othacehe@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AEDE017264; Wed, 21 Aug 2019 10:00:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 766211724B for <patchwork@mira.cbaines.net>; Wed, 21 Aug 2019 10:00:08 +0100 (BST) Received: from localhost ([::1]:45702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1i0MTO-00032l-PX for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQd-0008P8-Rp for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQc-00063i-RI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQc-00063Y-O3 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MQc-0006ix-MH for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 58/61] utils: Use target-arm64? and target-arm? helpers. Resent-From: Mathieu Othacehe <m.othacehe@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57:14 +0000 Resent-Message-ID: <handler.36477.B36477.156637780425631@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156637780425631 (code B ref 36477); Wed, 21 Aug 2019 08:57:14 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:44 +0000 Received: from localhost ([127.0.0.1]:34746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1i0MQ8-0006fF-8b for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:44 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:41951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <m.othacehe@gmail.com>) id 1i0MPN-0006Uo-6c for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:57 -0400 Received: by mail-wr1-f49.google.com with SMTP id j16so1229700wrr.8 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cXSRfja10rg0I4hDCOE+6pUFl9D2a5/TMWty+UQVIQ4=; b=nPsaFRGy0upWNbDttg0pN35e9YEw/edreIKRdtQUr01GjWASf5x/JzV6asvw5BKnN2 dK7MzSGPMvaOj77/65MOPxfdeR0L+GAuo9ljAnbD6fBTOOQNHw8y/mcQfYig56vGIol3 XZDYIDXgO1xksxDnrb5lYAxn+rm6CJ+9fRMWaE8pwIzlva+7iNCAmo5HsxPE+QlJXfTO M3ozWxqqcktNhhEyGboTn5qfBctQ4Y9XUoXvLS+iD3sVGUp7cW3YbIEZZiXE2jL6yAfH /fWd2WYDwnavH9trWi5t6NCrzQ55Mt8c/t0Xwu/02Hv5s72zRSBn1GBtfknxUNJ9qKSH 63/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cXSRfja10rg0I4hDCOE+6pUFl9D2a5/TMWty+UQVIQ4=; b=PcK2kbYDv1SuL95xgmBiSHTHS3SUqqzeSwtm3M4b6auT93YXGg35EZqg/LKpzwYMts qU9HWt/Q0e0LfG5jEPj0OxNL+4ve41aQz2nWbjK0xopfoT0lfuKvXDU+1eAWOkOPEs7b KRoZ7i/HsOiBkJJi7xSfFdFspcecbNZHBsdm3inWdQzR7gR/USGjtk7e8l107w1Fro+t RPpSUhIk/GrQU1NG3JToZm4IfshgDQbYGl1QbgfYrf7Mx1pzbhkaSwX9+bz7+dzoMWoA G8H/3rER1olXF8bohVJQZ0ZBZEHZzEyajbUdx1cKjTRDM2yUIi1wjJyn3q63c6sVBk8m E7sA== X-Gm-Message-State: APjAAAU6p1VgXVArPPeVU6XB3MEqM0Gm8AIoURc/bbdFewPeJ7g4Bjmz vRK+GNGbrXt6hI/H44/1MZNH0VYr5cs= X-Google-Smtp-Source: APXvYqy5h6fGR/gEHlfQCEPQ5PHmP2s6V5A1xg2MZV95YCc0t2EQ11k12LmOdaEpITLOcLeZjNw9cA== X-Received: by 2002:a05:6000:4d:: with SMTP id k13mr39618402wrx.196.1566377751333; Wed, 21 Aug 2019 01:55:51 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:50 -0700 (PDT) From: Mathieu Othacehe <m.othacehe@gmail.com> Date: Wed, 21 Aug 2019 10:54:52 +0200 Message-Id: <20190821085455.18508-58-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Cc: Mathieu Othacehe <m.othacehe@gmail.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
Add --target support to guix system
|
expand
|
diff --git a/guix/utils.scm b/guix/utils.scm index f480c3291f..3eb156ad4e 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -78,6 +78,8 @@ package-name->name+version target-mingw? target-arm32? + target-arm64? + target-arm? target-64bit? version-compare version>? @@ -493,6 +495,12 @@ a character other than '@'." (define (target-arm32?) (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define (target-arm64?) + (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) + +(define (target-arm?) + (or (target-arm32?) (target-arm64?))) + (define (target-64bit?) (let ((system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))))