rust: Respect HOSTCC when linking for host
PATCH v4 1/1 rust: Respect HOSTCC when linking for host
Currently, rustc defaults to invoking cc, even if HOSTCC is defined, resulting in build failures in hermetic environments where cc does not exist. This includes both hostprogs and proc-macros.
Since we are setting the linker to HOSTCC, we set the linker flavor to gcc explicitly. The linker-flavor selects both which linker to search for if the linker is unset, and which kind of linker flags to pass. Without this flag, rustc would attempt to determine which flags to pass based on the name of the binary passed as HOSTCC. gcc is the name of the linker-flavor used by rustc for all C compilers, including both gcc and clang.
---
Edited to use escsq in both Makefiles, as per Masahiro Yamada's suggestion.
rust/Makefile | 2 ++ scripts/Makefile.host | 2 ++ 2 files changed, 4 insertions(+)
rust/Makefile +2 -0
@@ -383,6 +383,8 @@ $(obj)/exports_kernel_generated.h: $(obj)/kernel.o FORCE quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ cmd_rustc_procmacro = \ $(RUSTC_OR_CLIPPY) $(rust_common_flags) \ + -Clinker-flavor=gcc -Clinker=$(HOSTCC) \ + -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ --emit=dep-info=$(depfile) --emit=link=$@ --extern proc_macro \ --crate-type proc-macro \ --crate-name $(patsubst lib%.so,%,$(notdir $@)) $<
scripts/Makefile.host +2 -0
@@ -91,6 +91,8 @@ hostcxx_flags = -Wp,-MMD,$(depfile) \ # 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) \ + -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ $(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \ $(HOSTRUSTFLAGS_$(target-stem))
Signature · 1 line
2.42.0.609.gbb76f46606-goog
Quoted 12 lines · Matthew Maurer
Currently, rustc defaults to invoking
cc, even ifHOSTCCis defined, resulting in build failures in hermetic environments whereccdoes not exist. This includes both hostprogs and proc-macros.Since we are setting the linker to
HOSTCC, we set the linker flavor togccexplicitly. The linker-flavor selects both which linker to search for if the linker is unset, and which kind of linker flags to pass. Without this flag,rustcwould attempt to determine which flags to pass based on the name of the binary passed asHOSTCC.gccis the name of the linker-flavor used byrustcfor all C compilers, including bothgccandclang.
Quoted 3 lines
Signed-off-by Matthew Maurer <[email protected]>---
[...]
Alice Ryhl
reviewerPATCH v4 1/1 rust: Respect HOSTCC when linking for host
In reply to Matthew MaurerQuoted 12 lines · Matthew Maurer
Currently, rustc defaults to invoking
cc, even ifHOSTCCis defined, resulting in build failures in hermetic environments whereccdoes not exist. This includes both hostprogs and proc-macros.Since we are setting the linker to
HOSTCC, we set the linker flavor togccexplicitly. The linker-flavor selects both which linker to search for if the linker is unset, and which kind of linker flags to pass. Without this flag,rustcwould attempt to determine which flags to pass based on the name of the binary passed asHOSTCC.gccis the name of the linker-flavor used byrustcfor all C compilers, including bothgccandclang.
Quoted 1 line
Signed-off-by Matthew Maurer <[email protected]>
Quoted 13 lines · Matthew Maurer
Currently, rustc defaults to invoking
cc, even ifHOSTCCis defined, resulting in build failures in hermetic environments whereccdoes not exist. This includes both hostprogs and proc-macros.Since we are setting the linker to
HOSTCC, we set the linker flavor togccexplicitly. The linker-flavor selects both which linker to search for if the linker is unset, and which kind of linker flags to pass. Without this flag,rustcwould attempt to determine which flags to pass based on the name of the binary passed asHOSTCC.gccis the name of the linker-flavor used byrustcfor all C compilers, including bothgccandclang.
Quoted 5 lines
Signed-off-by Matthew Maurer <[email protected]>---
Edited to use escsq in both Makefiles, as per Masahiro Yamada's suggestion.
That looks better; thanks Matthew!
Quoted 34 lines
rust/Makefile | 2 ++ scripts/Makefile.host | 2 ++ 2 files changed, 4 insertions(+)rust/Makefile +2
-0@@ -383,6 +383,8 @@ $(obj)/exports_kernel_generated.h: $(obj)/kernel.o FORCE quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ cmd_rustc_procmacro = \ $(RUSTC_OR_CLIPPY) $(rust_common_flags) \ + -Clinker-flavor=gcc -Clinker=$(HOSTCC) \ + -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ --emit=dep-info=$(depfile) --emit=link=$@ --extern proc_macro \ --crate-type proc-macro \ --crate-name $(patsubst lib%.so,%,$(notdir $@)) $<scripts/Makefile.host +2
-1@@ -91,6 +91,8 @@ hostcxx_flags = -Wp,-MMD,$(depfile) \ # 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) \ + -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ $(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \ $(HOSTRUSTFLAGS_$(target-stem)) --2.42.0.609.gbb76f46606-goog
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 13 lines · Matthew Maurer
Currently, rustc defaults to invoking
cc, even ifHOSTCCis defined, resulting in build failures in hermetic environments whereccdoes not exist. This includes both hostprogs and proc-macros.Since we are setting the linker to
HOSTCC, we set the linker flavor togccexplicitly. The linker-flavor selects both which linker to search for if the linker is unset, and which kind of linker flags to pass. Without this flag,rustcwould attempt to determine which flags to pass based on the name of the binary passed asHOSTCC.gccis the name of the linker-flavor used byrustcfor all C compilers, including bothgccandclang.
Quoted 5 lines
Signed-off-by Matthew Maurer <[email protected]>---
Edited to use escsq in both Makefiles, as per Masahiro Yamada's suggestion.
if Miguel picked this up.
Please let me know if I should pick this up.
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 6 lines · Masahiro Yamada
Acked-by Masahiro Yamada <[email protected]>if Miguel picked this up.
Please let me know if I should pick this up.
Thanks a lot for taking a look Masahiro -- either way is fine for me. If you want to take it, please feel free to add my Acked-by.
Cheers,
Miguel
Quoted 7 lines · Miguel Ojeda
Quoted 5 lines · Masahiro Yamada
Acked-by Masahiro Yamada <[email protected]>if Miguel picked this up.
Quoted 7 lines
Quoted 1 line
Please let me know if I should pick this up.
Thanks a lot for taking a look Masahiro -- either way is fine for me. If you want to take it, please feel free to add my
Acked-by.Cheers,
Miguel
I do not see this yet in linux-next.
So, I applied to linux-kbuild with Miguel's Ack now.
Signature · 2 lines
Best Regards Masahiro Yamada