From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1161D35177 for ; Wed, 1 Apr 2026 11:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=slHoneWmzovcsbVXKddjqYahErRjB0L+YAy9hgQnM2o=; b=PMtkLPQ4v1Qwq5vou3O0uV2Svs UMxoHFIBDyQZPUV86hWJNDNOZ/lfbkmxrFuCJTeyG0Z00j+dX4eCEfHOXdiJ3t+79W09UtL29xTh7 N5yy30p9POlHSIr0P+/RTOEL1MGD/TmC25zSVt6ClvaBMwo6BSQeypo/o3ElbLTHz6OQ03B7+I9yF SSDdbRBoPcWSaZrIVYixYvtL6yRs4scYz6rfh8yn+wRYHxxaSxwwxSoYpJIx2AixkKXc8JoviVaGG GOWvIxRFb+3pFjST2qvxU57vwMqEQJQtjx5uHicWJBugkgM6dbnMDr93Rk1rRdXRe6A4YjZVI4d3w KPq1fT7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w7u3C-0000000EguY-3eBM; Wed, 01 Apr 2026 11:47:59 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w7u3B-0000000Egti-3Wzu; Wed, 01 Apr 2026 11:47:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=slHoneWmzovcsbVXKddjqYahErRjB0L+YAy9hgQnM2o=; b=HbZyymdlc2ifam167g0VCJ/Ppg Y/hFGjxOUdRGg6cxjlQXLrFSoK+y6luX1aPz579TbLJjvUvxUAgTtD9StTTcCYtpdnMLDEkc6X7cf Ta9sAdQC893va3kV9atc5V+vfOSXG4ShGAiLfQFREORg5AyyCm5pF9DQOGEYqR2RFwJf/kIJ81A6D zZjwapzYWwYc3/XIgNauKnycAgAj250JVw4NhzjXy/XiewyJmd3NYU65HEhzkYAEdhiZBKhHnWybK FKcvVrnxsPxWTtC3ADHkuV3ZUhMxLlE5dP/His0VnZFHBYRhUXPXwUWlKjYz+1h6PLu0kgmkjavTY KIVQGtFA==; Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w7u37-00000000EWB-1RLy; Wed, 01 Apr 2026 11:47:55 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id F1C8B40912; Wed, 1 Apr 2026 11:47:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98766C116C6; Wed, 1 Apr 2026 11:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775044069; bh=xsU9IffmhOUWeURxd1cBn+xx+oWcdYdxyuUvVgPmku0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bw0XQFM9BtXzltVVfX1cRyS5Ny7916Ny6Nrc3TLq9KJZYh0JtBh+ukTFEyx8Z85t8 /vt7Jbc/zq1y9bQ1shJhG3VR8TxOtBZF4NjJHMa7mU/xZAlefh37LD+NPTu+Ydfi49 JZ53a+OUpRjXBEozckaDoUhJgDDxIg+j6uv+ZggEvUq3It6rUqjdZ6bh+lQmBq+fnd qgyPYo7kcXdNsMmw1yjq21a8J89cwAmGQvzQVu5nFumVK/lfkLoYnqg7V/B3EDnv2S Uy6UH8O6mHui9UIcrilZWtiKbbK/WhNF71Bx912WmOVg7CuvV4vNq3M2vlDeu6Xlr9 RAOV3bDFHx0ZA== From: Miguel Ojeda To: Miguel Ojeda , Nathan Chancellor , Nicolas Schier , Danilo Krummrich , Andreas Hindborg , Catalin Marinas , Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Courbot , David Airlie , Simona Vetter , Brendan Higgins , David Gow , Greg Kroah-Hartman , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Todd Kjos , Christian Brauner , Carlos Llamas , Alice Ryhl , Jonathan Corbet Cc: Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Trevor Gross , rust-for-linux@vger.kernel.org, linux-kbuild@vger.kernel.org, Lorenzo Stoakes , Vlastimil Babka , "Liam R . Howlett" , Uladzislau Rezki , linux-block@vger.kernel.org, linux-arm-kernel@lists.infradead.org (moderated for non-subscribers), Alexandre Ghiti , linux-riscv@lists.infradead.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rae Moar , linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Nick Desaulniers , Bill Wendling , Justin Stitt , llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Shuah Khan , linux-doc@vger.kernel.org Subject: [PATCH 09/33] rust: kbuild: make `--remap-path-prefix` workaround conditional Date: Wed, 1 Apr 2026 13:45:16 +0200 Message-ID: <20260401114540.30108-10-ojeda@kernel.org> In-Reply-To: <20260401114540.30108-1-ojeda@kernel.org> References: <20260401114540.30108-1-ojeda@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260401_124753_806280_619463A0 X-CRM114-Status: GOOD ( 10.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Internal Compiler Error that the comment mentions [1] was fixed in Rust 1.87.0 [2]. And, for other workarounds, we plan on limiting where we apply them [3]. Thus limit the ICE one too. This will help to make sure the workaround is not needed anymore on newer versions. Link: https://github.com/rust-lang/rust/issues/138520 [1] Link: https://github.com/rust-lang/rust/pull/138556 [2] Link: https://lore.kernel.org/rust-for-linux/20260205131815.2943152-2-mlksvender@gmail.com/ [3] Signed-off-by: Miguel Ojeda --- rust/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rust/Makefile b/rust/Makefile index 708530ee3613..163d2258e93f 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -145,10 +145,12 @@ doctests_modifiers_workaround := $(rustdoc_modifiers_workaround)$(if $(call rust # `rustdoc` ICEs on out-of-tree builds in Rust < 1.87.0 # (https://github.com/rust-lang/rust/issues/138520). Thus workaround the # issue skipping the flag. +rustdoc_remap_workaround := $(if $(call rustc-min-version,108700),,--remap-path-prefix=%) + quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< cmd_rustdoc = \ OBJTREE=$(abspath $(objtree)) \ - $(RUSTDOC) $(filter-out $(skip_flags) --remap-path-prefix=%,$(if $(rustdoc_host),$(rust_common_flags),$(rust_flags))) \ + $(RUSTDOC) $(filter-out $(skip_flags) $(rustdoc_remap_workaround),$(if $(rustdoc_host),$(rust_common_flags),$(rust_flags))) \ $(rustc_target_flags) -L$(objtree)/$(obj) \ -Zunstable-options --generate-link-to-definition \ --output $(rustdoc_output) \ -- 2.53.0