Skip to contentSkip to conversation

kbuild: remove unnecessary export of RUST_LIB_SRC

PATCH In review Masahiro Yamada 5 participants 5 messages Sep 13, 2024 – Sep 24, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: remove unnecessary export of RUST_LIB_SRC

If RUST_LIB_SRC is defined in the top-level Makefile (via an environment variable or command line), it is already exported.

The only situation where it is defined but not exported is when the top-level Makefile is wrapped by another Makefile (e.g., GNUmakefile). I cannot think of any other use cases.

I know some people use this tip to define custom variables. However, even in that case, you can export it directly in the wrapper Makefile.

Example GNUmakefile:

export RUST_LIB_SRC = /path/to/your/sysroot/lib/rustlib/src/rust/library include Makefile

---
This code was added by this commit:

https://github.com/Rust-for-Linux/linux/commit/3f46885dc03ed2d750085b2237078a1628323964

Please me know if I am missing something.

 Makefile | 4 ----
 1 file changed, 4 deletions(-)
Makefile +0 -4
index d57cfc6896b8..b194b7702a2e 100644
@@ -578,10 +578,6 @@ else
 	RUSTC_OR_CLIPPY = $(RUSTC)
 endif
 
-ifdef RUST_LIB_SRC
-	export RUST_LIB_SRC
-endif
-
 # Allows the usage of unstable features in stable compilers.
 export RUSTC_BOOTSTRAP := 1
 
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Masahiro Yamada

If RUST_LIB_SRC is defined in the top-level Makefile (via an environment variable or command line), it is already exported.

The only situation where it is defined but not exported is when the top-level Makefile is wrapped by another Makefile (e.g., GNUmakefile). I cannot think of any other use cases.

I know some people use this tip to define custom variables. However, even in that case, you can export it directly in the wrapper Makefile.

Example GNUmakefile:

export RUST_LIB_SRC = /path/to/your/sysroot/lib/rustlib/src/rust/library include Makefile

Quoted 7 lines

---
This code was added by this commit:

https://github.com/Rust-for-Linux/linux/commit/3f46885dc03ed2d750085b2237078a1628323964

Please me know if I am missing something.

Looks good to me.

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Masahiro Yamada
Quoted 11 lines · Masahiro Yamada

If RUST_LIB_SRC is defined in the top-level Makefile (via an environment variable or command line), it is already exported.

The only situation where it is defined but not exported is when the top-level Makefile is wrapped by another Makefile (e.g., GNUmakefile). I cannot think of any other use cases.

I know some people use this tip to define custom variables. However, even in that case, you can export it directly in the wrapper Makefile.

Quoted 6 lines

Example GNUmakefile:

export RUST_LIB_SRC = /path/to/your/sysroot/lib/rustlib/src/rust/library include Makefile

Acked-by
#4 lore raw
Quoted 9 lines · Miguel Ojeda
Quoted 6 lines · Masahiro Yamada

This code was added by this commit:

https://github.com/Rust-for-Linux/linux/commit/3f46885dc03ed2d750085b2237078a1628323964

Please me know if I am missing something.

I think it is OK -- unless Fiona recalls something:

As long as the export to rustc and the rust analyzer script works this looks good.

Quoted 8 lines

Thanks Masahiro for the simplification!

Cheers,
Miguel