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

Merge branch 'prefix-relibc' into 'master'

Browse Source 
Use REPO_BINARY when compiling relibc on sysroot

See merge request redox-os/redox!2246
This commit is contained in:
Jeremy Soller 2026-07-15 11:58:20 -06:00
commit aa7d45676f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -44,9 +44,9 @@ img:
stage: test
script:
- echo 'progress = bar:force:noscroll' > /etc/wgetrc
- curl "https://sh.rustup.rs" -sSf | sh -s -- -y --default-toolchain stable --profile minimal
- export PATH="$HOME/.cargo/bin:$PATH"
- export PODMAN_BUILD=0 SKIP_CHECK_TOOLS=1 REPO_BINARY=1 FSTOOLS_NO_MOUNT=1 COOKBOOK_VERBOSE=false
- ./podman/rustinstall.sh
- make ci-img IMG_TAG=$CI_COMMIT_REF_NAME
pkg:

2
mk/prefix.mk
View File

@ -72,7 +72,7 @@ else
endif
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CARGO="env -u CARGO cargo" $(PREFIX_CONFIG) && \
$(REPO_BIN) cook relibc
$(REPO_BIN) cook relibc $(COOKBOOK_OPTS)
ifneq ($(HOSTED_REDOX),1)
cp -r "$(RELIBC_TARGET)/stage/usr/". "$@.partial/$(GNU_TARGET)"
mkdir -p "$@.partial/$(GNU_TARGET)/usr"