alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

remove Rust artifacts during make clean

Browse Source 
This should use `cargo clean` instead of `rm -rf ...`. Also,
due to a typo, the `rm` did not actually remove the Rust artifacts.

Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Thomas Bertschinger 2023-12-20 15:02:28 -07:00 committed by Kent Overstreet
parent 0bacefdf5f
commit 2b97686ffa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -15,8 +15,10 @@ endif
ifeq ($(BUILD_VERBOSE),1) ifeq ($(BUILD_VERBOSE),1)
Q = Q =
CARGO_CLEAN_ARGS = --verbose
else else
Q = @ Q = @
CARGO_CLEAN_ARGS = --quiet
endif endif
CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \ CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
@ -46,9 +48,12 @@ CARGO_ARGS=${CARGO_TOOLCHAIN}
CARGO=cargo $(CARGO_ARGS) CARGO=cargo $(CARGO_ARGS)
CARGO_PROFILE=release CARGO_PROFILE=release
# CARGO_PROFILE=debug # CARGO_PROFILE=debug
CARGO_MANIFEST=--manifest-path rust-src/Cargo.toml
CARGO_BUILD_ARGS=--$(CARGO_PROFILE) CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) $(CARGO_MANIFEST)
CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS) $(CARGO_MANIFEST)
include Makefile.compiler include Makefile.compiler
@ -177,7 +182,7 @@ libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs') RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs')
rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS) rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS)
$(CARGO_BUILD) --manifest-path rust-src/Cargo.toml $(CARGO_BUILD)
tests/test_helper: $(filter ./tests/%.o, $(OBJS)) tests/test_helper: $(filter ./tests/%.o, $(OBJS))
@echo " [LD] $@" @echo " [LD] $@"
@ -222,7 +227,7 @@ install_systemd: $(systemd_services) $(systemd_libfiles)
clean: clean:
@echo "Cleaning all" @echo "Cleaning all"
$(Q)$(RM) bcachefs libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED) $(Q)$(RM) bcachefs libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
$(Q)$(RM) -rf rust-src/*/target $(Q)$(CARGO_CLEAN)
$(Q)$(RM) -f $(built_scripts) $(Q)$(RM) -f $(built_scripts)
.PHONY: deb .PHONY: deb