From fd549a53dae58573fd9ef54482e81e05d5c3647f Mon Sep 17 00:00:00 2001 From: Wildan M Date: Wed, 15 Jul 2026 20:11:15 +0700 Subject: [PATCH] Use REPO_BINARY when compiling relibc on sysroot --- .gitlab-ci.yml | 2 +- mk/prefix.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d976da5ab..f295c7032 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/mk/prefix.mk b/mk/prefix.mk index 50ba5c1df..3b9ede1ce 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -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"