Makefile | 3 ++- rust/Makefile | 8 +++++--- scripts/.gitignore | 1 + scripts/Makefile | 3 +++ scripts/Makefile.host | 23 +++++++++++++++++++++-- 5 files changed, 32 insertions(+), 6 deletions(-)
rustc's -C linker= option expects a single executable path. When
HOSTCC contains a wrapper (e.g. "ccache gcc"), passing
`-Clinker=$(HOSTCC)` results in the shell splitting the value into
multiple words, and rustc interprets the additional word as an
input filename:
error: multiple input filenames provided ...
Generate a small wrapper script and pass it to -Clinker e.g.
```
#!/bin/sh
ccache gcc "$@"
```
Note that the wrapper intentionally avoids a leading `exec` to
naturally support leading environment assignments such as:
`VAR=VAL ccache gcc`.
This fix should be general enough to address most if not all cases
(incl. wrappers or subcommands) and avoids surprises of simpler fixes
like just defaulting to gcc.
This avoids passing the user command as an environment variable as
that would be more challenging to trace and debug shell expansions.
Link: https://github.com/Rust-for-Linux/linux/issues/1224
Suggested-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc>
---
v7 -> v8:
- Unify into a single global `scripts/rustc-wrapper`, instead of
generating per-directory wrappers.
- Use `$(objtree)/scripts/rustc-wrapper` when passing the wrapper to
`rustc` for clarity.
- Keep make dependencies on `scripts/rustc-wrapper`, since the rule
is defined for that target name.
- Drop the sample-local clean/ignore handling that was only needed
for per-directory wrappers.
v6 -> v7:
- Always generate `scripts/rustc-wrapper` when `CONFIG_RUST=y`,
including cases with no Rust host programs in `scripts/`.
- Use `$(obj)/rustc-wrapper` for host Rust programs, fixing builds
outside `scripts/`, e.g. `samples/rust/hostprogs/`.
- Remove leading exec (again) to allow leading env vars e.g.
HOSTRUSTC_LD="VAR=VAL ccache gcc".
- Track, clean and ignore generated wrapper as needed.
v5 -> v6:
- Add fix to `rust/Makefile` as well
- Include script to `.gitignore` and make clean
- Add back the outer `exec` to the command
v4 -> v5:
- Fix word splitting issues
- Remove unnecessary `exec sh -c` and simplify generated script
v3 -> v4:
- Use filechk instead of if_changed macro to regenerate script
- Remove trailing space at EOL
v2 -> v3:
- Scrap previous hacky approaches (e.g. using lastword) and go with
a proper fix which turned out not that complex to implement.
v1 -> v2:
- Rename HOSTRUSTC_LINKER to HOSTRUSTC_LD for consistency
- Introduce explicit HOSTRUSTC_LD override
- Warn when falling back due to multi-argument HOSTCC
- Error out if a user-specified HOSTRUSTC_LD is not an executable
v1: https://lore.kernel.org/all/20260225102819.16553-1-mo@sdhn.cc/
v2: https://lore.kernel.org/all/20260227132713.23106-1-mo@sdhn.cc/
v3: https://lore.kernel.org/all/20260312002852.11292-1-mo@sdhn.cc/
v4: https://lore.kernel.org/all/20260317112021.14353-1-mo@sdhn.cc/
v5: https://lore.kernel.org/all/20260321150034.9915-1-mo@sdhn.cc/
v6: https://lore.kernel.org/all/20260331000802.380-1-mo@sdhn.cc/
v7: https://lore.kernel.org/all/20260416211525.13847-1-mo@sdhn.cc/
---
Makefile | 3 ++-
rust/Makefile | 8 +++++---
scripts/.gitignore | 1 +
scripts/Makefile | 3 +++
scripts/Makefile.host | 23 +++++++++++++++++++++--
5 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 1a219bf1c..5ebeef67f 100644
--- a/Makefile
+++ b/Makefile
@@ -1651,7 +1651,8 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \
modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \
compile_commands.json rust/test \
rust-project.json .vmlinux.objs .vmlinux.export.c \
- .builtin-dtbs-list .builtin-dtb.S
+ .builtin-dtbs-list .builtin-dtb.S \
+ scripts/rustc-wrapper
# Directories & files removed with 'make mrproper'
MRPROPER_FILES += include/config include/generated \
diff --git a/rust/Makefile b/rust/Makefile
index 5eca6a817..620d397db 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -565,7 +565,7 @@ $(obj)/libsyn.rlib: $(src)/syn/lib.rs $(obj)/libquote.rlib FORCE
quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@
cmd_rustc_procmacro = \
$(RUSTC_OR_CLIPPY) $(rust_common_flags) $(rustc_target_flags) \
- -Clinker-flavor=gcc -Clinker=$(HOSTCC) \
+ -Clinker-flavor=gcc -Clinker=$(objtree)/scripts/rustc-wrapper \
-Clink-args='$(call escsq,$(KBUILD_PROCMACROLDFLAGS))' \
--emit=dep-info=$(depfile) --emit=link=$@ --extern proc_macro \
--crate-type proc-macro -L$(objtree)/$(obj) \
@@ -576,12 +576,14 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@
$(obj)/$(libmacros_name): private rustc_target_flags = \
--extern proc_macro2 --extern quote --extern syn
$(obj)/$(libmacros_name): $(src)/macros/lib.rs $(obj)/libproc_macro2.rlib \
- $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE
+ $(obj)/libquote.rlib $(obj)/libsyn.rlib \
+ scripts/rustc-wrapper FORCE
+$(call if_changed_dep,rustc_procmacro)
$(obj)/$(libpin_init_internal_name): private rustc_target_flags = $(pin_init_internal-flags)
$(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs \
- $(obj)/libproc_macro2.rlib $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE
+ $(obj)/libproc_macro2.rlib $(obj)/libquote.rlib $(obj)/libsyn.rlib \
+ scripts/rustc-wrapper FORCE
+$(call if_changed_dep,rustc_procmacro)
# `rustc` requires `-Zunstable-options` to use custom target specifications
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 4215c2208..b3948b148 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -6,6 +6,7 @@
/kallsyms
/module.lds
/recordmcount
+/rustc-wrapper
/rustdoc_test_builder
/rustdoc_test_gen
/sign-file
diff --git a/scripts/Makefile b/scripts/Makefile
index 0941e5ce7..287421322 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -29,6 +29,9 @@ generate_rust_target-rust := y
rustdoc_test_builder-rust := y
rustdoc_test_gen-rust := y
+always-$(CONFIG_RUST) += rustc-wrapper
+clean-files += rustc-wrapper
+
HOSTCFLAGS_tracepoint-update.o = -I$(srctree)/tools/include
HOSTCFLAGS_elf-parse.o = -I$(srctree)/tools/include
HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index c1dedf646..ab810e42b 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -87,11 +87,30 @@ hostcxx_flags = -Wp,-MMD,$(depfile) \
$(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
$(HOSTCXXFLAGS_$(target-stem).o)
+# rustc's `-Clinker=` expects a single executable path, not a command line.
+# `HOSTCC` may be a multi-word command when wrapped (e.g. "ccache gcc"), which
+# would otherwise be split by the shell and mis-parsed by rustc.
+# To work around this, we generate a script that invokes `HOSTRUSTC_LD` with the
+# linker arguments appended so such commands can be used safely.
+#
+# Set `HOSTRUSTC_LD` for a different rustc linker command than `HOSTCC`
+HOSTRUSTC_LD ?= $(HOSTCC)
+
+define filechk_rustc-wrapper
+ printf "%s\n" \
+ '#!/bin/sh' \
+ '$(call escsq,$(HOSTRUSTC_LD)) "$$@"'
+endef
+
+scripts/rustc-wrapper: FORCE
+ $(call filechk,rustc-wrapper)
+ $(Q)chmod +x $@
+
# `--out-dir` is required to avoid temporaries being created by `rustc` in the
# current working directory, which may be not accessible in the out-of-tree
# modules case.
hostrust_flags = --out-dir $(dir $@) --emit=dep-info=$(depfile) \
- -Clinker-flavor=gcc -Clinker=$(HOSTCC) \
+ -Clinker-flavor=gcc -Clinker=$(objtree)/scripts/rustc-wrapper \
-Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \
$(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \
$(HOSTRUSTFLAGS_$(target-stem))
@@ -153,7 +172,7 @@ $(host-cxxobjs): $(obj)/%.o: $(obj)/%.cc FORCE
quiet_cmd_host-rust = HOSTRUSTC $@
cmd_host-rust = \
$(HOSTRUSTC) $(hostrust_flags) --emit=link=$@ $<
-$(host-rust): $(obj)/%: $(src)/%.rs FORCE
+$(host-rust): $(obj)/%: $(src)/%.rs scripts/rustc-wrapper FORCE
+$(call if_changed_dep,host-rust)
targets += $(host-csingle) $(host-cmulti) $(host-cobjs) \
--
2.54.0On Sat, May 9, 2026 at 12:20 PM Mohamad Alsadhan <mo@sdhn.cc> wrote:
>
> rustc's -C linker= option expects a single executable path. When
> HOSTCC contains a wrapper (e.g. "ccache gcc"), passing
> `-Clinker=$(HOSTCC)` results in the shell splitting the value into
> multiple words, and rustc interprets the additional word as an
> input filename:
I have been taking a look at this, and considered applying it since
Kbuild is OK with it (thanks a lot for all the work during the
different versions), but I am not sure if the following bits are all
intended:
- Shouldn't `HOSTRUSTC_LD` be documented in `Documentation/kbuild/kbuild.rst`?
- Why do we do both `clean-files` and `CLEAN_FILES`?
+ In fact, should we do it on `clean` or `mrproper`? Nicolas
originally suggested `MRPROPER_FILES`, but this is on `CLEAN_FILES`.
But more on that below, since I guess it depends on how we treat
out-of-tree modules...
- Was this tested with an out-of-tree module? I am asking because:
+ It does create an unused wrapper in a `scripts/` folder in the
out-of-tree module directory (i.e. the one used is the in-tree one) --
is that intended?
+ If we remove the wrapper during `clean` as the patch currently
does, then it means we cannot build Rust host programs in an
out-of-tree module (because it uses the in-tree one). Should it be in
`mrproper` instead, or should we generate a per-out-of-tree-module
one?
While I think the kernel generally expects that the same
toolchain is used for both the main build and out-of-tree modules (it
may happen to work otherwise, but as a policy it is not supposed to be
supported, or at least that is what I recall I was told), I am not
sure if it applies to host programs. I guess someone may want to use a
different host toolchain vs. the one used to build the main kernel,
and I guess things would generally work.
- The `filechk` could fail if we use Rust host programs in more
folders later on, i.e. if two submakes run it at the same time, and
one at the end deletes the (shared) temporary, then the other will
fail if it was in the middle of updating it.
- Since we have now `zerocopy-derive`, which is a proc macro, I had
to add a dependency for that one too like the other two.
Some good news, though, is that the whole `clean` thing made me
realize I missed the `mrproper` for `zerocopy-derive`, so I am sending
a quick patch for that.
Cheers,
Miguel
On Sat May 9, 2026 at 12:19 PM CEST, Mohamad Alsadhan wrote: > rustc's -C linker= option expects a single executable path. When > HOSTCC contains a wrapper (e.g. "ccache gcc"), passing > `-Clinker=$(HOSTCC)` results in the shell splitting the value into > multiple words, and rustc interprets the additional word as an > input filename: > > error: multiple input filenames provided ... > > Generate a small wrapper script and pass it to -Clinker e.g. > > ``` > #!/bin/sh > ccache gcc "$@" > ``` > > Note that the wrapper intentionally avoids a leading `exec` to > naturally support leading environment assignments such as: > `VAR=VAL ccache gcc`. > > This fix should be general enough to address most if not all cases > (incl. wrappers or subcommands) and avoids surprises of simpler fixes > like just defaulting to gcc. > > This avoids passing the user command as an environment variable as > that would be more challenging to trace and debug shell expansions. > > Link: https://github.com/Rust-for-Linux/linux/issues/1224 > Suggested-by: Yoann Congal <yoann.congal@smile.fr> > Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc> Hello, I also tested this one: Tested-by: Yoann Congal <yoann.congal@smile.fr> Thanks! > --- > v7 -> v8: > - Unify into a single global `scripts/rustc-wrapper`, instead of > generating per-directory wrappers. > - Use `$(objtree)/scripts/rustc-wrapper` when passing the wrapper to > `rustc` for clarity. > - Keep make dependencies on `scripts/rustc-wrapper`, since the rule > is defined for that target name. > - Drop the sample-local clean/ignore handling that was only needed > for per-directory wrappers. > > v6 -> v7: > - Always generate `scripts/rustc-wrapper` when `CONFIG_RUST=y`, > including cases with no Rust host programs in `scripts/`. > - Use `$(obj)/rustc-wrapper` for host Rust programs, fixing builds > outside `scripts/`, e.g. `samples/rust/hostprogs/`. > - Remove leading exec (again) to allow leading env vars e.g. > HOSTRUSTC_LD="VAR=VAL ccache gcc". > - Track, clean and ignore generated wrapper as needed. > > v5 -> v6: > - Add fix to `rust/Makefile` as well > - Include script to `.gitignore` and make clean > - Add back the outer `exec` to the command > > v4 -> v5: > - Fix word splitting issues > - Remove unnecessary `exec sh -c` and simplify generated script > > v3 -> v4: > - Use filechk instead of if_changed macro to regenerate script > - Remove trailing space at EOL > > v2 -> v3: > - Scrap previous hacky approaches (e.g. using lastword) and go with > a proper fix which turned out not that complex to implement. > > v1 -> v2: > - Rename HOSTRUSTC_LINKER to HOSTRUSTC_LD for consistency > - Introduce explicit HOSTRUSTC_LD override > - Warn when falling back due to multi-argument HOSTCC > - Error out if a user-specified HOSTRUSTC_LD is not an executable > > v1: https://lore.kernel.org/all/20260225102819.16553-1-mo@sdhn.cc/ > v2: https://lore.kernel.org/all/20260227132713.23106-1-mo@sdhn.cc/ > v3: https://lore.kernel.org/all/20260312002852.11292-1-mo@sdhn.cc/ > v4: https://lore.kernel.org/all/20260317112021.14353-1-mo@sdhn.cc/ > v5: https://lore.kernel.org/all/20260321150034.9915-1-mo@sdhn.cc/ > v6: https://lore.kernel.org/all/20260331000802.380-1-mo@sdhn.cc/ > v7: https://lore.kernel.org/all/20260416211525.13847-1-mo@sdhn.cc/ > --- > Makefile | 3 ++- > rust/Makefile | 8 +++++--- > scripts/.gitignore | 1 + > scripts/Makefile | 3 +++ > scripts/Makefile.host | 23 +++++++++++++++++++++-- > 5 files changed, 32 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 1a219bf1c..5ebeef67f 100644 > --- a/Makefile > +++ b/Makefile > @@ -1651,7 +1651,8 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \ > modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \ > compile_commands.json rust/test \ > rust-project.json .vmlinux.objs .vmlinux.export.c \ > - .builtin-dtbs-list .builtin-dtb.S > + .builtin-dtbs-list .builtin-dtb.S \ > + scripts/rustc-wrapper > > # Directories & files removed with 'make mrproper' > MRPROPER_FILES += include/config include/generated \ > diff --git a/rust/Makefile b/rust/Makefile > index 5eca6a817..620d397db 100644 > --- a/rust/Makefile > +++ b/rust/Makefile > @@ -565,7 +565,7 @@ $(obj)/libsyn.rlib: $(src)/syn/lib.rs $(obj)/libquote.rlib FORCE > quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ > cmd_rustc_procmacro = \ > $(RUSTC_OR_CLIPPY) $(rust_common_flags) $(rustc_target_flags) \ > - -Clinker-flavor=gcc -Clinker=$(HOSTCC) \ > + -Clinker-flavor=gcc -Clinker=$(objtree)/scripts/rustc-wrapper \ > -Clink-args='$(call escsq,$(KBUILD_PROCMACROLDFLAGS))' \ > --emit=dep-info=$(depfile) --emit=link=$@ --extern proc_macro \ > --crate-type proc-macro -L$(objtree)/$(obj) \ > @@ -576,12 +576,14 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ > $(obj)/$(libmacros_name): private rustc_target_flags = \ > --extern proc_macro2 --extern quote --extern syn > $(obj)/$(libmacros_name): $(src)/macros/lib.rs $(obj)/libproc_macro2.rlib \ > - $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE > + $(obj)/libquote.rlib $(obj)/libsyn.rlib \ > + scripts/rustc-wrapper FORCE > +$(call if_changed_dep,rustc_procmacro) > > $(obj)/$(libpin_init_internal_name): private rustc_target_flags = $(pin_init_internal-flags) > $(obj)/$(libpin_init_internal_name): $(src)/pin-init/internal/src/lib.rs \ > - $(obj)/libproc_macro2.rlib $(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE > + $(obj)/libproc_macro2.rlib $(obj)/libquote.rlib $(obj)/libsyn.rlib \ > + scripts/rustc-wrapper FORCE > +$(call if_changed_dep,rustc_procmacro) > > # `rustc` requires `-Zunstable-options` to use custom target specifications > diff --git a/scripts/.gitignore b/scripts/.gitignore > index 4215c2208..b3948b148 100644 > --- a/scripts/.gitignore > +++ b/scripts/.gitignore > @@ -6,6 +6,7 @@ > /kallsyms > /module.lds > /recordmcount > +/rustc-wrapper > /rustdoc_test_builder > /rustdoc_test_gen > /sign-file > diff --git a/scripts/Makefile b/scripts/Makefile > index 0941e5ce7..287421322 100644 > --- a/scripts/Makefile > +++ b/scripts/Makefile > @@ -29,6 +29,9 @@ generate_rust_target-rust := y > rustdoc_test_builder-rust := y > rustdoc_test_gen-rust := y > > +always-$(CONFIG_RUST) += rustc-wrapper > +clean-files += rustc-wrapper > + > HOSTCFLAGS_tracepoint-update.o = -I$(srctree)/tools/include > HOSTCFLAGS_elf-parse.o = -I$(srctree)/tools/include > HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include > diff --git a/scripts/Makefile.host b/scripts/Makefile.host > index c1dedf646..ab810e42b 100644 > --- a/scripts/Makefile.host > +++ b/scripts/Makefile.host > @@ -87,11 +87,30 @@ hostcxx_flags = -Wp,-MMD,$(depfile) \ > $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ > $(HOSTCXXFLAGS_$(target-stem).o) > > +# rustc's `-Clinker=` expects a single executable path, not a command line. > +# `HOSTCC` may be a multi-word command when wrapped (e.g. "ccache gcc"), which > +# would otherwise be split by the shell and mis-parsed by rustc. > +# To work around this, we generate a script that invokes `HOSTRUSTC_LD` with the > +# linker arguments appended so such commands can be used safely. > +# > +# Set `HOSTRUSTC_LD` for a different rustc linker command than `HOSTCC` > +HOSTRUSTC_LD ?= $(HOSTCC) > + > +define filechk_rustc-wrapper > + printf "%s\n" \ > + '#!/bin/sh' \ > + '$(call escsq,$(HOSTRUSTC_LD)) "$$@"' > +endef > + > +scripts/rustc-wrapper: FORCE > + $(call filechk,rustc-wrapper) > + $(Q)chmod +x $@ > + > # `--out-dir` is required to avoid temporaries being created by `rustc` in the > # current working directory, which may be not accessible in the out-of-tree > # modules case. > hostrust_flags = --out-dir $(dir $@) --emit=dep-info=$(depfile) \ > - -Clinker-flavor=gcc -Clinker=$(HOSTCC) \ > + -Clinker-flavor=gcc -Clinker=$(objtree)/scripts/rustc-wrapper \ > -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ > $(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \ > $(HOSTRUSTFLAGS_$(target-stem)) > @@ -153,7 +172,7 @@ $(host-cxxobjs): $(obj)/%.o: $(obj)/%.cc FORCE > quiet_cmd_host-rust = HOSTRUSTC $@ > cmd_host-rust = \ > $(HOSTRUSTC) $(hostrust_flags) --emit=link=$@ $< > -$(host-rust): $(obj)/%: $(src)/%.rs FORCE > +$(host-rust): $(obj)/%: $(src)/%.rs scripts/rustc-wrapper FORCE > +$(call if_changed_dep,host-rust) > > targets += $(host-csingle) $(host-cmulti) $(host-cobjs) \ -- Yoann Congal Smile ECS
Hi Mohamad,
On Sat, May 09, 2026 at 01:19:38PM +0300, Mohamad Alsadhan wrote:
> rustc's -C linker= option expects a single executable path. When
> HOSTCC contains a wrapper (e.g. "ccache gcc"), passing
> `-Clinker=$(HOSTCC)` results in the shell splitting the value into
> multiple words, and rustc interprets the additional word as an
> input filename:
>
> error: multiple input filenames provided ...
>
> Generate a small wrapper script and pass it to -Clinker e.g.
>
> ```
> #!/bin/sh
> ccache gcc "$@"
> ```
>
> Note that the wrapper intentionally avoids a leading `exec` to
> naturally support leading environment assignments such as:
> `VAR=VAL ccache gcc`.
>
> This fix should be general enough to address most if not all cases
> (incl. wrappers or subcommands) and avoids surprises of simpler fixes
> like just defaulting to gcc.
>
> This avoids passing the user command as an environment variable as
> that would be more challenging to trace and debug shell expansions.
>
> Link: https://github.com/Rust-for-Linux/linux/issues/1224
> Suggested-by: Yoann Congal <yoann.congal@smile.fr>
> Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc>
Thanks, this seems reasonable from a Kbuild perspective (although
Nicolas may have other comments) and it appears to work for me. I expect
this to go via the Rust tree.
Acked-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
> diff --git a/Makefile b/Makefile
> index 1a219bf1c..5ebeef67f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1651,7 +1651,8 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \
> modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \
> compile_commands.json rust/test \
> rust-project.json .vmlinux.objs .vmlinux.export.c \
> - .builtin-dtbs-list .builtin-dtb.S
> + .builtin-dtbs-list .builtin-dtb.S \
> + scripts/rustc-wrapper
What tree was this generated against? It conflicts with Linus's tree due
to commit a76e30c2479c ("kbuild: Delete .builtin-dtbs.S when running
make clean") that landed in 7.0-rc6.
>
> # Directories & files removed with 'make mrproper'
> MRPROPER_FILES += include/config include/generated \
--
Cheers,
Nathan
On Mon, May 11, 2026 at 03:59:15PM +0900, Nathan Chancellor wrote: > Hi Mohamad, > > On Sat, May 09, 2026 at 01:19:38PM +0300, Mohamad Alsadhan wrote: > > rustc's -C linker= option expects a single executable path. When > > HOSTCC contains a wrapper (e.g. "ccache gcc"), passing > > `-Clinker=$(HOSTCC)` results in the shell splitting the value into > > multiple words, and rustc interprets the additional word as an > > input filename: > > > > error: multiple input filenames provided ... > > > > Generate a small wrapper script and pass it to -Clinker e.g. > > > > ``` > > #!/bin/sh > > ccache gcc "$@" > > ``` > > > > Note that the wrapper intentionally avoids a leading `exec` to > > naturally support leading environment assignments such as: > > `VAR=VAL ccache gcc`. > > > > This fix should be general enough to address most if not all cases > > (incl. wrappers or subcommands) and avoids surprises of simpler fixes > > like just defaulting to gcc. > > > > This avoids passing the user command as an environment variable as > > that would be more challenging to trace and debug shell expansions. > > > > Link: https://github.com/Rust-for-Linux/linux/issues/1224 > > Suggested-by: Yoann Congal <yoann.congal@smile.fr> > > Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc> > > Thanks, this seems reasonable from a Kbuild perspective (although > Nicolas may have other comments) and it appears to work for me. I expect > this to go via the Rust tree. > > Acked-by: Nathan Chancellor <nathan@kernel.org> > Tested-by: Nathan Chancellor <nathan@kernel.org> > > > diff --git a/Makefile b/Makefile > > index 1a219bf1c..5ebeef67f 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1651,7 +1651,8 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \ > > modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \ > > compile_commands.json rust/test \ > > rust-project.json .vmlinux.objs .vmlinux.export.c \ > > - .builtin-dtbs-list .builtin-dtb.S > > + .builtin-dtbs-list .builtin-dtb.S \ (If it'd go through kbuild, I'd fix the spaces-only here during patch application.) Thanks, no further objections. Reviewed-by: Nicolas Schier <nsc@kernel.org> -- Nicolas
© 2016 - 2026 Red Hat, Inc.