MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cleaner-relibc' into 'master'

Browse Source 
Make clean relibc implies clean sysroot

See merge request redox-os/redox!1796
This commit is contained in:
Jeremy Soller 2025-12-31 06:03:11 -07:00
commit 0f6174ced3
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/prefix.mk
View File

@ -22,8 +22,8 @@ prefix: $(PREFIX)/sysroot
# Update relibc used for compiling and clean all statically linked recipes
prefix_clean: | $(FSTOOLS_TAG)
rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG)
$(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs,relibc
$(MAKE) c.relibc
$(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs
$(PREFIX)/relibc-install: $(PREFIX)/rust-install | $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1)

12
mk/repo.mk
View File

@ -39,6 +39,16 @@ else
@./target/release/repo find $(foreach f,$(subst $(comma), ,$*),$(f))
endif
# Invoke clean for relibc in recipe and relibc in sysroot
c.relibc: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
./target/release/repo clean relibc
rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG)
@echo "\033[1;36;49mSysroot cleaned\033[0m"
endif
# Invoke clean for one or more targets separated by comma
c.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
@ -58,7 +68,7 @@ else
endif
# Invoke repo.sh for one or more targets separated by comma
r.%: $(FSTOOLS_TAG) FORCE
r.%: prefix $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else

2
src/bin/repo.rs
View File

@ -237,7 +237,7 @@ fn main_inner() -> anyhow::Result<()> {
return publish_packages(&recipe_names, &config.repo_dir);
}
if verbose {
if verbose && recipe_names.len() > 1 {
println!(
"\nCommand '{}' completed for {} recipes.",
command.to_string(),