From patchwork Fri Mar 4 09:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37603 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 2197227BBEA; Fri, 4 Mar 2022 10:01:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 DBC0127BBE9 for ; Fri, 4 Mar 2022 10:01:48 +0000 (GMT) Received: from localhost ([::1]:39718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4kt-0006jM-Qt for patchwork@mira.cbaines.net; Fri, 04 Mar 2022 05:01:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-0006iZ-DL for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4kA-00063v-3g for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ4kA-0000Tj-28 for guix-patches@gnu.org; Fri, 04 Mar 2022 05:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v2 1/5] gnu: Add cross-llvm. References: <20220303170252.3caec0a6@tachikoma.lepiller.eu> In-Reply-To: <20220303170252.3caec0a6@tachikoma.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Mar 2022 10:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463880061649 (code B ref 54239); Fri, 04 Mar 2022 10:01:02 +0000 Received: (at 54239) by debbugs.gnu.org; 4 Mar 2022 10:00:06 +0000 Received: from localhost ([127.0.0.1]:44574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jF-0000QK-0f for submit@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:06 -0500 Received: from lepiller.eu ([89.234.186.109]:57142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ4jB-0000PL-I7 for 54239@debbugs.gnu.org; Fri, 04 Mar 2022 05:00:03 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 0c521cff for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=PVbHQsUpe7ZCSCXqtXYm4YfVJ 4XJ1fuE4mRuGe9Iu+g=; b=Dv6g1l0UWQd4camKeeVi6NlhP41tDoT0AMZov2zlu fozSRTuFd4nnptLTRce0125OZg9yqCZ3J964etacbU/XUICD2uk6qQYWL+B9FUuL N7C/fChF81h9knn1Mp56zVh2IGslv6os2Znd0WSXPtNXs/YXph9JcTiSDqdGeoXW 9kZ64+41X9Bz/AU6H1CAs3Y1CD0pNd2qXrtAbqZFvJf97bq5QWID9Y9CO5UZRn7k 5Cqdr8IcDCN41M1qPJWeGx74etjcm27iqDtCzTMncyMX+nIzzBdO/b3dBB+TkUz1 Y4hlqBfduMJvYr9DMnowMeauzvfkpo3wu2LV3nEHiGtbw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b8e65455 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Fri, 4 Mar 2022 09:59:59 +0000 (UTC) From: Julien Lepiller Date: Fri, 4 Mar 2022 10:59:49 +0100 Message-Id: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646387919.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 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 * gnu/packages/llvm.scm (cross-llvm): New variable. --- gnu/packages/llvm.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index eb949bed1b..d6e9846699 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2020, 2021 Maxim Cournoyer -;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2021, 2022 Julien Lepiller ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer @@ -74,7 +74,8 @@ (define-module (gnu packages llvm) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (make-lld-wrapper - system->llvm-target)) + system->llvm-target + cross-llvm)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -99,6 +100,22 @@ (define* (system->llvm-target #:optional ("i686" => "X86") ("i586" => "X86")))) +(define (cross-llvm llvm target) + "Return a native LLVM package that targets a different system. The resulting +libraries are running on the host but target a different system by default. +This packge can be used to control clang's default target." + (package + (inherit llvm) + (arguments + (substitute-keyword-arguments (package-arguments llvm) + ((#:configure-flags flags) + #~(append + (list + (string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" #$target) + (string-append "-DLLVM_TARGET_ARCH=" + #$(system->llvm-target (gnu-triplet->nix-system target)))) + #$flags)))))) + (define (llvm-uri component version) ;; LLVM release candidate file names are formatted 'tool-A.B.C-rcN/tool-A.B.CrcN.src.tar.xz' ;; so we specify the version as A.B.C-rcN and delete the hyphen when referencing the file name.