From patchwork Thu Dec 14 22:22:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Ojeda X-Patchwork-Id: 178939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8889675dys; Thu, 14 Dec 2023 14:23:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhUscHjDbsZhNolrIz/UVW1h6K5p+RW+awCShwUb7zzMu8J4oT6UhrdLmTOR/UGOG9ws0G X-Received: by 2002:ac8:5a42:0:b0:425:4043:2a0c with SMTP id o2-20020ac85a42000000b0042540432a0cmr15992028qta.135.1702592613476; Thu, 14 Dec 2023 14:23:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702592613; cv=none; d=google.com; s=arc-20160816; b=W5zQgn+DCiVEi9UbIjzJoJXcOlYj6ekd0fpsaTTX4Uly88BRXS4e6+3Sl95kSy97p7 OfFvCZOhOLaDOcZIBG7kY3oFgwus1Rh+zaETz4YZGyBr5gQ7pXhMn5xjCtUbtaPLTMfW 3QZ9BgImXYqM9eqGKQJK9NBRmn4ccW307+1ys5K5qtQpvUQMV3MXX1v4C/SxLRAHsz8C pJh5+el95bKR7VZ1jp40ZNdOlcE2JRt/i1CVf34+UWRreSm7Ayo25IQnsks5g/HMuexy X620CISJx7/cF1ZPZ9WwEtpxHOZaUqnjyHh5lG9noi9raWL5iOEQ9YjsR1DsQJ9uP3Ea +Vhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=2XXst07nknW0l6uACkPyWWBXUPw/FxLNvLtoP6e392E=; fh=QSgolHeNGRlAM0OXE00xeOGX8y4YA1YVQI+ETCOl/lQ=; b=yOgjnqXVG+LTSRC7QLIahqMa8B6b47fAEsx3AgKHfLiFwlMppAXXeXI5VndPwxBqJY rNQyP079r4K5JBIjfzZ2QGySG00twyaDLoJBM5cB6mIs/Wka12sWTiHKCHvBe+6jZ4v2 Y5YBFkxWkUDRRHvldmMAVZEGq35MPDrYnqkUx3cV93NIyWdqqjPy0okKHYOp3jl5qPyL srR5nFKXC0qyiXxFSHTXMM8ocW8i11GYIhFlp98say+ytEJE3AKoaHTIRf/asvKAQIs9 tcyOs2a2shhTsoiOvI3hNI8GkPf5MG8coTteJYdWvmBfHQ0QzLh9f9p2t9z0yNLyIq14 1tBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hy1KhZDQ; spf=pass (google.com: domain of linux-kernel+bounces-186-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-186-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bb21-20020a05622a1b1500b00423759c77cdsi5321581qtb.523.2023.12.14.14.23.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 14:23:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-186-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hy1KhZDQ; spf=pass (google.com: domain of linux-kernel+bounces-186-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-186-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 445581C21DE4 for ; Thu, 14 Dec 2023 22:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C69B66ADF; Thu, 14 Dec 2023 22:23:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hy1KhZDQ" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B4746720A; Thu, 14 Dec 2023 22:23:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34043C433C8; Thu, 14 Dec 2023 22:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702592591; bh=pgyu4wBiidMdBiu1uYG+TluTmLJL6JHzn+KTryLFeg4=; h=From:To:Cc:Subject:Date:From; b=hy1KhZDQeVmw/PKAZKMyHpyFpLjMJvZ9nzmSzg1q25LbazraEx0KJ3LDB8nRJJvpX 3jXCtGicmnegnajOaGeUiliNcYAg0Kv2/pOJZIINAIncAfSGEUcFTdS6+Sw3FkUUIV O0nRnHfXWkFc0zAIDOsUyh8cCkqx1OCcYo+K5aMstdkf6vM6GKbcRbXYnQdMNrbxjS qHc1tXmWh4RrjAfJAr3gYMqXpOSQIpykKFOM4pyoP6GAAVRIW4qrdMLUlff6dQIqiv /4fO0fIg7F5Iy4RdxU4hqQedtn/JRLasYTUA9lvGmygWOzBJ/DJrzVqJiNz0QSh+q5 z8xkqRXYjB/TQ== From: Miguel Ojeda To: Masahiro Yamada , Miguel Ojeda , Wedson Almeida Filho , Alex Gaynor Cc: Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , linux-kbuild@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH] kbuild: rust: add `rustupoverride` target Date: Thu, 14 Dec 2023 23:22:53 +0100 Message-ID: <20231214222253.116734-1-ojeda@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785297752164087228 X-GMAIL-MSGID: 1785297752164087228 When setting up the Rust support via `rustup`, one may use an override in order to select the right version of the Rust toolchain. The current instructions at Documentation/rust/quick-start.rst assume one is using an in-tree kernel build (i.e. no `O=`) [1]. We would like to provide also the way to do so for `O=` builds, but ideally in a way that keeps the one-liner copy-pastable and without duplication [2]. Thus provide a new Make target, `rustupoverride`, that sets it up for the user given their build options/variables. Link: https://lore.kernel.org/rust-for-linux/20231207084846.faset66xzuoyvdlg@vireshk-i7/ [1] Link: https://lore.kernel.org/rust-for-linux/CANiq72=mvca8PXoxwzSao+QFbAHDCecSKCDtV+ffd+YgZNFaww@mail.gmail.com/ [2] Signed-off-by: Miguel Ojeda Reviewed-by: Martin Rodriguez Reboredo Tested-by: David Gow Reviewed-by: Alice Ryhl Reviewed-by: Tiago Lam --- Viresh may send a patch on top of this to refer to `rustupoverride` from the Quick Start guide in `Documentation/rust` -- that one should probably be applied right after this one. Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 -- 2.43.0 diff --git a/Makefile b/Makefile index 70fc4c11dfc0..7fe82dd4dc6f 100644 --- a/Makefile +++ b/Makefile @@ -276,7 +276,8 @@ no-dot-config-targets := $(clean-targets) \ cscope gtags TAGS tags help% %docs check% coccicheck \ $(version_h) headers headers_% archheaders archscripts \ %asm-generic kernelversion %src-pkg dt_binding_check \ - outputmakefile rustavailable rustfmt rustfmtcheck + outputmakefile rustavailable rustfmt rustfmtcheck \ + rustupoverride no-sync-config-targets := $(no-dot-config-targets) %install modules_sign kernelrelease \ image_name single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/ @@ -1611,6 +1612,7 @@ help: @echo ' (requires kernel .config; downloads external repos)' @echo ' rust-analyzer - Generate rust-project.json rust-analyzer support file' @echo ' (requires kernel .config)' + @echo ' rustupoverride - Set up a rustup override for the build directory' @echo ' dir/file.[os] - Build specified target only' @echo ' dir/file.rsi - Build macro expanded source, similar to C preprocessing.' @echo ' Run with RUSTFMT=n to skip reformatting if needed.' @@ -1735,6 +1737,11 @@ rustfmt: rustfmtcheck: rustfmt_flags = --check rustfmtcheck: rustfmt +# `rustup override` setup target +PHONY += rustupoverride +rustupoverride: + $(Q)rustup override set $(shell $(srctree)/scripts/min-tool-version.sh rustc) + # Misc # ---------------------------------------------------------------------------