From patchwork Thu Jan 28 22:03:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 26711 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 2932727BC1D; Thu, 28 Jan 2021 22:05:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5BF8027BC1C for ; Thu, 28 Jan 2021 22:05:57 +0000 (GMT) Received: from localhost ([::1]:50910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5FQK-00038x-IO for patchwork@mira.cbaines.net; Thu, 28 Jan 2021 17:05:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5FPT-00038i-EF for guix-patches@gnu.org; Thu, 28 Jan 2021 17:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5FPS-00057w-Ts for guix-patches@gnu.org; Thu, 28 Jan 2021 17:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l5FPS-0005yk-L2 for guix-patches@gnu.org; Thu, 28 Jan 2021 17:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46163] [PATCH] staging gnu: Add wasm32 target to rustc. Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jan 2021 22:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46163@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161187144422893 (code B ref -1); Thu, 28 Jan 2021 22:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jan 2021 22:04:04 +0000 Received: from localhost ([127.0.0.1]:50479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5FOV-0005xB-V9 for submit@debbugs.gnu.org; Thu, 28 Jan 2021 17:04:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:44960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5FOT-0005wm-Il for submit@debbugs.gnu.org; Thu, 28 Jan 2021 17:04:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5FOT-00031B-D0 for guix-patches@gnu.org; Thu, 28 Jan 2021 17:04:01 -0500 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:53458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5FOR-0004no-Pg for guix-patches@gnu.org; Thu, 28 Jan 2021 17:04:01 -0500 Received: by mail-pj1-x1034.google.com with SMTP id p15so4675079pjv.3 for ; Thu, 28 Jan 2021 14:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=RP6NdKegF5LSy4a3bxqMB3sVEDGtaqf+F5cOtA4JXVY=; b=j4JlEf96IylEXjlp5GUoBk/NKzb7gtunv5ocgyHN3ZEQCltVZtYMCNrt731F9xY7gR zt3rMLaX8zASigt67rtOvSN0yj9HsXTCi4m/gWDNEHz6b4tHFACbgU9OWLP0CzZIIfOk p8CmrtW2Papcae+ZNveUPfHFtSqFlOay1BT3BV4aMn+6q/mB7/QNumIlCx1IOYYy/V1K nZolt/lkA1RUTGY/dt7mkY02miAiqocKMysCK+mXsXSNOiCI/BM6B6zVBq0SroaQJcFC U/fB/t1ycNWAY7Qc7/oSevRCZQKck4uV5nbJZXbhz0duPLvZs5zobJUu783g42Q8e7i8 DElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=RP6NdKegF5LSy4a3bxqMB3sVEDGtaqf+F5cOtA4JXVY=; b=ml+xqYfUeqBJwzcwQokLj0lzRvbrlBDJsqhfleLkwkVNGE4F/v8x0hDU8kMNtMy6IT 8qzFLtMGeKNr/UGAKIGGI5GIK9wFdjS2HDVlgbClYfKrzkun3amWPvtKkAMhmZ3EQmqi GDyfoyFjUFCq4iEiJlTkiuU0FSMW8rXIFJPHCUm6rcfcWKL2ZcpRs8m1sbzOyCOnuO3B IPeAoy8PQxgMpqhwuS1um2/ie9Po7imJY2afA8WMFnt9JqrX8Vbtvu5lZCtrwU+lbBi9 Xd5aLPyDoST+TgoPpFx+0xrT+qPGLMKo3nbjynqfe9lcqiYFVK6M7LRtFRvRVAWAYeJw Yo2A== X-Gm-Message-State: AOAM531+UX6lj/cIHXAn09ZMAopOXpV+D+5R5zQZ1aITOj6FhoGz9smM jx0u5cH7PSYpBJ79h06DX1C3nnhV11Ostg== X-Google-Smtp-Source: ABdhPJwb50D/IoSZ8xSOLFzYU9nebFE8KYh9GZ/05BEVwP59IU1c9gp9dLNqaqrZReBVZItFE9L+6A== X-Received: by 2002:a17:90a:df0c:: with SMTP id gp12mr1420041pjb.3.1611871438155; Thu, 28 Jan 2021 14:03:58 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id e63sm6676678pfe.216.2021.01.28.14.03.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jan 2021 14:03:57 -0800 (PST) From: John Soo Date: Thu, 28 Jan 2021 14:03:56 -0800 Message-ID: <87bld8k9bn.fsf@asu.edu> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=jsoo1@asu.edu; helo=mail-pj1-x1034.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Guix! Recently I had to work with some webassembly and rust and our current compiler did not support the target. This patch adds wasm32 support. Kindly, John From ab40dbfd2db1a06939c353d7cb0cb64841dbaa35 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 23 Jan 2021 08:43:52 -0800 Subject: [PATCH] gnu: Add wasm32 target to rust@1.46. * gnu/packages/rust.scm (rust-1.46): [arguments] Add wasm32 to target configuration, [native-inputs] Add node for tests. --- gnu/packages/rust.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 98ae770745..7b40372cb2 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1349,7 +1349,21 @@ move around." (generate-all-checksums "vendor") #t)) (replace 'build - (lambda* _ + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "config.toml" + (("\\[build\\]" all) + (string-append all " +target = [\"" ,(nix-system->gnu-triplet-for-rust) "\", \"wasm32-unknown-unknown\"] +")) + (("\\[dist\\]" all) + (string-append " +[target.wasm32-unknown-unknown] +llvm-config = \"" (assoc-ref inputs "llvm") "/bin/llvm-config\" +cc = \"" (assoc-ref inputs "gcc") "/bin/gcc\" +cxx = \"" (assoc-ref inputs "gcc") "/bin/g++\" +ar = \"" (assoc-ref inputs "binutils") "/bin/ar\" +" +all))) (invoke "./x.py" "build") (invoke "./x.py" "build" "src/tools/cargo") (invoke "./x.py" "build" "src/tools/rustfmt") @@ -1364,7 +1378,9 @@ move around." (string-append "-j" (number->string (min 4 (parallel-job-count)))))) - (invoke "./x.py" parallel-job-spec "test" "-vv") + (invoke "./x.py" parallel-job-spec "test" + (string-append "--target=" ,(nix-system->gnu-triplet-for-rust)) + "-vv") (invoke "./x.py" parallel-job-spec "test" "src/tools/cargo") (invoke "./x.py" parallel-job-spec "test" -- 2.30.0