From 3f46885dc03ed2d750085b2237078a1628323964 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Sun, 25 Apr 2021 10:41:28 +0200 Subject: [PATCH] Add RUST_LIB_SRC make argument for nix builds This can also used in an other non rustup context to improve usability. Signed-off-by: Finn Behrens --- Makefile | 4 ++++ rust/Makefile | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 62b3bba3863553..8b87658d9f6239 100644 --- a/Makefile +++ b/Makefile @@ -534,6 +534,10 @@ else endif export RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY +ifdef RUST_LIB_SRC + export RUST_LIB_SRC +endif + export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC RUSTC BINDGEN export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX diff --git a/rust/Makefile b/rust/Makefile index 2d1d9d7af77cae..dded5d664b2738 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -127,11 +127,11 @@ quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L # `$(rustc_flags)` is passed in case the user added `--sysroot`. rustc_sysroot = $(shell $(RUSTC) $(rustc_flags) --print sysroot) -rustc_src = $(rustc_sysroot)/lib/rustlib/src/rust +RUST_LIB_SRC ?= $(rustc_sysroot)/lib/rustlib/src/rust/library .SECONDEXPANSION: $(objtree)/rust/core.o: private skip_clippy = 1 -$(objtree)/rust/core.o: $$(rustc_src)/library/core/src/lib.rs FORCE +$(objtree)/rust/core.o: $$(RUST_LIB_SRC)/core/src/lib.rs FORCE $(call if_changed_dep,rustc_library) $(objtree)/rust/compiler_builtins.o: private rustc_objcopy = -w -W '__*' @@ -140,7 +140,7 @@ $(objtree)/rust/compiler_builtins.o: $(srctree)/rust/compiler_builtins.rs \ $(call if_changed_dep,rustc_library) $(objtree)/rust/alloc.o: private skip_clippy = 1 -$(objtree)/rust/alloc.o: $$(rustc_src)/library/alloc/src/lib.rs \ +$(objtree)/rust/alloc.o: $$(RUST_LIB_SRC)/alloc/src/lib.rs \ $(objtree)/rust/compiler_builtins.o FORCE $(call if_changed_dep,rustc_library)