From patchwork Tue Apr 8 19:58:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41465 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 DBF5027BC4A; Tue, 8 Apr 2025 20:59:28 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DDC9A27BC4C for ; Tue, 8 Apr 2025 20:59:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2F6B-0007IB-GQ; Tue, 08 Apr 2025 15:59:07 -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 1u2F68-0007EW-5q for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:05 -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 1u2F67-0003Rx-Rc for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=CKE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=E6RYxVvBFW66uWxSMCqJa7YSNvHjvwiy94/tEMvGulGwEG3f3Uon4klCKnpT1OnskBOlwooDp79IebWB+XopNP6hx1wlVs+XVJVwUp5mkCVR5m1dJKJLkIi4gI6/ApliCoKnTIPEORS6CjbkWucLC1OEzaA054ulZe9hrdwba0LlhAWgE+jKo56SDP64WIM4JMmucr3VrSiwZ5w4iRvXrTdhLhY7EkTb5yxqMsh1JCvLyLVddm0Qtqqv/5qC1RoO37v//Dn+SH8lGF9DCr0lKJvub10NC/j7S43KM5gnA0TFW/yuxrW+ZM6yPqira3U8iGmcbtDtkZsjixMAxhuYgw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2F67-0000N7-JD for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77653] [PATCH 3/4] gnu: Add wasm32-wasi-clang. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 19:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77653@debbugs.gnu.org Cc: Ian Eure Received: via spool by 77653-submit@debbugs.gnu.org id=B77653.17441423321382 (code B ref 77653); Tue, 08 Apr 2025 19:59:03 +0000 Received: (at 77653) by debbugs.gnu.org; 8 Apr 2025 19:58:52 +0000 Received: from localhost ([127.0.0.1]:35619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2F5v-0000MC-RW for submit@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:52 -0400 Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:60185) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2F5l-0000LC-KV for 77653@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:41 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 569381380194; Tue, 8 Apr 2025 15:58:36 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Tue, 08 Apr 2025 15:58:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1744142316; x= 1744228716; bh=CKE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=g m/VOemtCH8AsGO3O1wuOAnAnBXLDGsyMDA0QzE5kbe2L0ijKlIdIF6aqQcwuJJoN wW4x6+OQxBl1PdXuTg2XJR9zmwc06M0MNGJdFnHpCwQrNzJKCM2eSBX1Gm8I4R0E 6pqhQY7+p4XofEp3CAHFvEKbWDX36QOEI0i1YyqPPSltezooqNvsQTItl/egJoC3 wLyp1O/4yXD4MSseB7eqsaZSIO9FYlu3TNrrWrHJlcRrJFOGrDOZhq56D+O5JyAF 3I+yrqJE9bizwr7d/2Zlbjyz9gIfRSX4UobAvgAVlfmIny9a3jXg4InUm5HbvS8t DLIAWefaeBsnp/2uW6dew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1744142316; x=1744228716; bh=C KE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=sJlgz1mB/yxxZ2wGT LL8GoELDrWbeeuGPbdbPBVm7CyGFdxTUxeQq+QBIvkq0BYBIxj7P6+Yhf6tCJ6kR LstVIDsMMpARR+ADhtb3+n0iZDtcF9AQnqLagOh41JeVdWk8Nptl2f5He7yi+Cnf CQrk1knQLMUoR5+lWJRuA8LVeZe0wNz1hpR/D3/XaxSIT2RgGc14NeTzF5RgoGIh 9dHAMT4BQujcveIUekgNdpJn7lnN5DC+5sPXCXwS02sgKzalOxBatyp8G5ZPrF5t wVZvSUKfzYfBP76KdC9M8VLW8uTOyt4TxAMGsCoT3n4pDQFxe4L0JlGOJdWbLi2s b+qqQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtdefleelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvte eiueetgfeukedvfeeiuedvveelfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejjeeiheefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Apr 2025 15:58:35 -0400 (EDT) From: Ian Eure Date: Tue, 8 Apr 2025 12:58:28 -0700 Message-ID: <20250408195830.2084-3-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408195830.2084-1-ian@retrospec.tv> References: <20250408195830.2084-1-ian@retrospec.tv> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wasm.scm (wasm32-wasi-clang): New variable. Change-Id: Ibf1df3e93929442a8eed29eea20b2f83b491f3b3 --- gnu/packages/wasm.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wasm.scm b/gnu/packages/wasm.scm index 53ea31f4a7..447687d009 100644 --- a/gnu/packages/wasm.scm +++ b/gnu/packages/wasm.scm @@ -24,7 +24,8 @@ (define-module (gnu packages wasm) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public wasi-libc (package @@ -106,3 +107,29 @@ (define-public wasm32-wasi-clang-runtime ;; WASM only needs libclang_rt.builtins-wasm32.a from ;; compiler-rt. "../source/compiler-rt/lib/builtins"))))) + +;; Although Clang can be built to support multiple compilation targets, Guix +;; builds only target the native architecture, so we have to build a build a +;; new toolchain that to target WASM. + +(define clang-from-llvm (@@ (gnu packages llvm) clang-from-llvm)) +(define llvm-monorepo (@@ (gnu packages llvm) llvm-monorepo)) + +(define-public wasm32-wasi-clang + (let ((base (clang-from-llvm llvm-16 wasm32-wasi-clang-runtime))) + (package (inherit base) + (name "wasm32-wasi-clang") + (inputs + (modify-inputs (package-inputs base) + (prepend wasi-libc))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(list "-DCLANG_INCLUDE_TESTS=True" + ;; Use a sane default include directory. + (string-append "-DC_INCLUDE_DIRS=" + #$wasi-libc + "/wasm32-wasi/include"))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'symlink-cfi_ignorelist))))))))