Commit 804490c3 authored by Dmitrii Dolgov's avatar Dmitrii Dolgov Committed by Arnaldo Carvalho de Melo
Browse files

tools build: Fix feature test for rust compiler 



Currently a dummy rust code is compiled to detect if the rust feature
could be enabled. It turns out that in this case rust emits a dependency
file without any external references:

    /perf/feature/test-rust.d: test-rust.rs

    /perf/feature/test-rust.bin: test-rust.rs

    test-rust.rs:

This can lead to a situation, when rustc was removed after a successful build,
but the build process still thinks it's there and the feature is enabled on
subsequent runs.

Instead simply check the compiler presence to detect the feature, as
suggested by Arnaldo.

This way no actual test-rust.bin will be created, meaning the feature
check will not be cached and always performed. That's exactly what we
want, and the overhead of doing this every time is minimal.

Tested with multiple rounds of install/remove of the rust package.

Reported-by: default avatarArnaldo Carvalho de Melo <acme@kernel.org>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: default avatarDmitrii Dolgov <9erthalion6@gmail.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1a6c4596

tools/build/feature/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ __BUILD = $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $( 
__BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS)

  BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1



__BUILDRS = $(RUSTC) $(RUSTC_FLAGS) --emit=dep-info=$(patsubst %.bin,%.d,$(@F)),link -o $@ $(patsubst %.bin,%.rs,$(@F))

  BUILDRS = $(__BUILDRS) > $(@:.bin=.make.output) 2>&1



###############################



$(OUTPUT)test-all.bin:
@@ -393,8 +390,13 @@ $(OUTPUT)test-bpftool-skeletons.bin: 
	$(SYSTEM_BPFTOOL) version | grep '^features:.*skeletons' \

		> $(@:.bin=.make.output) 2>&1



# Testing Rust is special: we don't compile anything, it's enough to check the

# compiler presence. Compiling a test code for this purposes is problematic,

# because Rust will emit a dependency file without any external references,

# meaning that if rustc will be removed the build process will still think it's

# there.

$(OUTPUT)test-rust.bin:

	$(BUILDRS) > $(@:.bin=.make.output) 2>&1

	$(RUSTC) --version > /dev/null 2>&1



###############################

tools/build/feature/test-rust.rs

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

fn main() {

    println!("hi")

}