From patchwork Sat Mar 25 12:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 48666 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 6BE5416FA7; Sat, 25 Mar 2023 12:15:05 +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=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 4DED616D87 for ; Sat, 25 Mar 2023 12:14:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pg2mb-0004Ch-CJ; Sat, 25 Mar 2023 08:14:05 -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 1pg2mY-0004AD-Ju for guix-patches@gnu.org; Sat, 25 Mar 2023 08:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pg2mY-00029M-9q for guix-patches@gnu.org; Sat, 25 Mar 2023 08:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pg2mY-0004Wr-4F for guix-patches@gnu.org; Sat, 25 Mar 2023 08:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62438] [PATCH] gnu: llvm: fix riscv64 cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Mar 2023 12:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62438 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62438@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167974643017382 (code B ref -1); Sat, 25 Mar 2023 12:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2023 12:13:50 +0000 Received: from localhost ([127.0.0.1]:41956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pg2mM-0004WI-7O for submit@debbugs.gnu.org; Sat, 25 Mar 2023 08:13:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:39766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pg2mG-0004W7-Jo for submit@debbugs.gnu.org; Sat, 25 Mar 2023 08:13:48 -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 <873216071@qq.com>) id 1pg2mF-00049O-Ql for guix-patches@gnu.org; Sat, 25 Mar 2023 08:13:44 -0400 Received: from out203-205-251-53.mail.qq.com ([203.205.251.53]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1pg2mA-00028O-Ry for guix-patches@gnu.org; Sat, 25 Mar 2023 08:13:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1679746407; bh=qubjXBr5AdLNZzXDpCTe/r9OvFqtbw/+8dOzPySpQMM=; h=From:To:Subject:Date; b=pB8BAn8p5Arr67TCdmpJBRpjxtnPq3AnsqyFu6fiYzjnpWNVbiw2tfdFOUzBZ1emq DdJ+H47/010vAB4eaeYgfnYEqPtO5OJGYAwnZazTWOY1Ha45sTopuq0+fsHyZWz519 5fnXmfN4W0sVjm9zkdYcq3yD8rSZ6tCW0M91NJEQ= Received: from localhost.localdomain ([111.0.51.145]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 356BD283; Sat, 25 Mar 2023 20:13:22 +0800 X-QQ-mid: xmsmtpt1679746402tvui6n2yl Message-ID: X-QQ-XMAILINFO: NafziRg7Bx698Ceptbp4SLBwYp21getQPqVavzkc258ARrPDKML/kCGLuAVKaf hQjVEwpGH01KDxfGy4NJUwm9E34ZwSFmdlqhZQiUx34C1UeFkB4rt4liJu3Y6D6JoYnUh1GM6INw oy0ui0pdb+RTc4KHJQbDsRlN7jK81tQZq4jvLr3pViTPPIfRop+it5n/jTx3Y9OznPI3tAsAfTaA kciuacUwaIFkPkuyfygszl57eRcG05KB7wIJTXKmc0L9NRHT1M3pujxBqiH+liX06+D7Tr0TCM5r 9eSbgPIWPpdNLhOwR2nW7YMSJ/lIKiLEvut4KD4MYdeON9Q9Wly+hqCoT9s+Wyh8laZPtlnnheoL cZ/IDyclSu3RjlA++HTFxgz/a9a46FmeNv+xCEyGehO8aAmGKwK2MKXWRR8UnPC8MCfHUVwRkHTr D36e/fTqb3pxqHOD5rU1w6x5J2OEsgzDVmXqg3rUUDl1nYP6/AiIP6ST1TIRoVq72i9Yeq6iYVgg /45878DlvwbBxH1SREZg/OVqabIeln0lunjMy6uaNhaEpvN36NQnkDBHsX/6a0aIB0363CRjDwon N5NGyeGIuPno1NhdvMxWIwG6uNw6RuJBcn9M9wQdV9p6l7tVFhRUpguaeDVpNidSc6ww4AQ7NBbt g2I3aTdy3Q623avUafTrQlqvsmfilLTOwwy60knJTOnipR4IO0DGh6Hfif0GdbssIuUpRqI5+9at Kg6L943GnuzEuCTzzezUxyJnACN/N4wnrmn8zoTQnQ/Vr5MC1rZ/6XMLq6C+II7ThMzFLmNzVOlV VUo2LmS5HwnyBuwcMCWGeY7QBwO/WyYk05J9gHegt5QNIIFyA/5fKySJneE88FUAn4e10EZqv7Jv krRQimjllVDTZv2mTQGn8mT8ijys8yv5ELt+kW/c75nPiC5+lwCwxkYaVx1OPmI5AXuSNtcXAjiZ fVzupL7/E= Date: Sat, 25 Mar 2023 20:13:21 +0800 X-OQ-MSGID: <18e753b2f39276b82e86daaec9adf0a2e7793666.1679746393.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.251.53; envelope-from=873216071@qq.com; helo=out203-205-251-53.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm: (llvm-15 llvm-14 llvm-12): fix riscv64 cross-compile [arguments]: <#:configure>: when target is riscv64, set -DLLVM_TARGET_ARCH=RISCV64. --- gnu/packages/llvm.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index e5bf9f5cae..f8691414d8 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Clément Lassieur ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -598,7 +599,9 @@ (define-public llvm-15 #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (if (target-riscv64?) + "RISCV64" + (system->llvm-target))) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) '()) @@ -658,7 +661,9 @@ (define-public llvm-14 #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (if (target-riscv64?) + "RISCV64" + (system->llvm-target))) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) '()) @@ -910,7 +915,9 @@ (define-public llvm-12 #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (if (target-riscv64?) + "RISCV64" + (system->llvm-target))) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) #~())