From patchwork Mon Feb 15 18:04:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 27072 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 D428527BC45; Mon, 15 Feb 2021 18:05:15 +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 4C5A827BC2E for ; Mon, 15 Feb 2021 18:05:14 +0000 (GMT) Received: from localhost ([::1]:49854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBiFF-0008BW-Gy for patchwork@mira.cbaines.net; Mon, 15 Feb 2021 13:05:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBiF4-0008BN-V5 for guix-patches@gnu.org; Mon, 15 Feb 2021 13:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lBiF4-0005Gu-4m for guix-patches@gnu.org; Mon, 15 Feb 2021 13:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lBiF3-0007EB-U2 for guix-patches@gnu.org; Mon, 15 Feb 2021 13:05:01 -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: Mon, 15 Feb 2021 18:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46163@debbugs.gnu.org Received: via spool by 46163-submit@debbugs.gnu.org id=B46163.161341227627746 (code B ref 46163); Mon, 15 Feb 2021 18:05:01 +0000 Received: (at 46163) by debbugs.gnu.org; 15 Feb 2021 18:04:36 +0000 Received: from localhost ([127.0.0.1]:38654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiEe-0007DS-6k for submit@debbugs.gnu.org; Mon, 15 Feb 2021 13:04:36 -0500 Received: from mail-pl1-f177.google.com ([209.85.214.177]:39490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lBiEb-0007DE-AP for 46163@debbugs.gnu.org; Mon, 15 Feb 2021 13:04:35 -0500 Received: by mail-pl1-f177.google.com with SMTP id k22so4136582pll.6 for <46163@debbugs.gnu.org>; Mon, 15 Feb 2021 10:04:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=f2b35dp/b5UEZbaOQYZ4YTyNw7YDjRMDucOy1AHXMio=; b=2D8K9+CzgIDpvcErGLesXdmgP0LmHpvSqJKxBvzpY/AZ4qaV+32Ynt/K/gKGuJ0/Nn beh9VHpyzw9ebtakZvXfT6hXaPFcqQRWc+UENihPbTdeB0IGoO2RuienoijVa5r/2oW/ M1f9WM8zv8vYYoUeeUIsaPV5VLBeVl5ez0G3kiLrplIFeulDgNqCPoNGg412Z7PHbOpL rkcK5NTUZ2x8GQIbxIn5xBVWkrkMpyjrTyAEevKSI2udtxeUfcYuKvW/PPUXapyAB165 LcCLAsiLLMtNmRmmd2qwaCOWPuS6RZfKs+/pKS0cTBYAhdv2Q9timaDIvnWMKLtZeDJl Llgw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=f2b35dp/b5UEZbaOQYZ4YTyNw7YDjRMDucOy1AHXMio=; b=Pu6C3nUebl5ZYWCSv/VWWnYZDDefvVL3A6uWrDEb9XRPH5hTMqsYNP3rUl6z+HZzk2 qTY/1rnP6GFtsZFgkkcDdeb9KA8/t3OaWMZSoB/R1+Pz3pp9/pRYIsYD8fBstWomHmQl liDQ1zXuCovn6a0H3ClerdOUssUn5WDXj9WQ+jcdemDA0cBIe0gN90xx67U/TNWu9Cw7 9D1EorkWnngD/Lg4zL5ysqKyoejT5ojqYJ0ulnlcRAFSMuxPttyW5uo2OEYig/Up4pEU grgQ7pfxb7U2rEvSJ40a/GoX9G7Qg+/oAYOMAvuDAMo5w7LTuX92h9K9swogQ80fJMlE VIRw== X-Gm-Message-State: AOAM533/clKgfmkdmIZ3kRTr7hNxTh2OXnTR+6m1+tdjKH63LJILkMiR 1SpWNgfS6lENePfIkzeL5goftU701slKPA== X-Google-Smtp-Source: ABdhPJw7UUwvJIavJYw93bDAYiLkgeG3dA3rv2OgFKaB7fZ4KvbbVe8rrLqXQocoUyzIKi/pzDoGhw== X-Received: by 2002:a17:90b:80c:: with SMTP id bk12mr74784pjb.83.1613412264429; Mon, 15 Feb 2021 10:04:24 -0800 (PST) Received: from ecenter (cpe-76-175-213-72.socal.res.rr.com. [76.175.213.72]) by smtp.gmail.com with ESMTPSA id d68sm19176560pfd.85.2021.02.15.10.04.20 for <46163@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Feb 2021 10:04:20 -0800 (PST) From: John Soo References: <87bld8k9bn.fsf@asu.edu> Date: Mon, 15 Feb 2021 10:04:19 -0800 In-Reply-To: <87bld8k9bn.fsf@asu.edu> (John Soo's message of "Thu, 28 Jan 2021 14:03:56 -0800") Message-ID: <87czx1w6l8.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) 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 Rebased on staging! From 610f9ba4c3d7c4e053929c57ddae25d55cf4682f 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 | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 8a09e1077e..01f9d26729 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") @@ -1363,7 +1377,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" @@ -1459,6 +1475,13 @@ tools = (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases + ;; Rustdocs fail to build with wasm32 target + ;; See https://github.com/rust-lang/rust/issues/76526 + (add-after 'configure 'deny-warnings + (lambda _ + (substitute* "config.toml" + (("\\[rust\\]" all) (string-append all " +deny-warnings = false"))))) ;; The source code got rearranged: libstd is now in the newly created library folder. (replace 'patch-tests (lambda* (#:key inputs #:allow-other-keys) -- 2.30.0