Merge branch 'dyn-link' into 'master'

Make ion and pkgutils dynamically linked

See merge request redox-os/redox!2068
This commit is contained in:
Jeremy Soller 2026-04-16 06:52:41 -06:00
commit 663fae3b85
3 changed files with 4 additions and 12 deletions

View File

@ -32,7 +32,7 @@ prefix_clean:
# Remove relibc in sysroot and all statically linked recipes
static_clean: | $(FSTOOLS_TAG)
$(MAKE) c.relibc
$(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs
$(MAKE) c.base,base-initfs,extrautils,kernel,redoxfs
$(MAKE) c.bash,luajit,gettext,openssl1,openssl3,pcre2,sdl1,zstd,zlib,bzip2,xz
$(MAKE) c.expat,freetype2,libffi,libiconv,libjpeg,liborbital,libpng,libxml2,ncurses,ncursesw
rm -rf $(REPO_TAG)

View File

@ -2,8 +2,4 @@
git = "https://gitlab.redox-os.org/redox-os/ion.git"
[build]
template = "custom"
script = """
# Must be statically linked
cookbook_cargo
"""
template = "cargo"

View File

@ -2,9 +2,5 @@
git = "https://gitlab.redox-os.org/redox-os/pkgutils.git"
[build]
template = "custom"
script = """
# Must be statically linked
COOKBOOK_CARGO_PATH=pkg-cli
cookbook_cargo
"""
template = "cargo"
cargopath = "pkg-cli"