From 8484033e1a1efe8c7ee8218d31532638d7851ebd Mon Sep 17 00:00:00 2001 From: Wildan M Date: Mon, 28 Sep 2026 13:43:47 +0700 Subject: [PATCH] Fix passing redoxer rustflags --- Cargo.lock | 2 +- src/cook/script.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f5df5fad0..9f63bb527 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#f50e0d7f490b60110ee6494a06d9b2f9981f8a5a" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#9281d1d591adf2db028e06a7d75767ad9b55d54f" dependencies = [ "anyhow", "dirs", diff --git a/src/cook/script.rs b/src/cook/script.rs index f7e5765df..12d94ddc4 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -35,7 +35,8 @@ function DYNAMIC_INIT { # TODO: check paths for spaces export LDFLAGS="${USER_LDFLAGS}-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib -L${COOKBOOK_SYSROOT}/lib -Wl,--export-dynamic" - export RUSTFLAGS="-C target-feature=-crt-static -L native=${COOKBOOK_SYSROOT}/lib -C link-arg=-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib" + rustflags="-C target-feature=-crt-static -L native=${COOKBOOK_SYSROOT}/lib -C link-arg=-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib" + export "${REDOXER_RUSTFLAGS_KEY}=${!REDOXER_RUSTFLAGS_KEY} ${rustflags}" export COOKBOOK_DYNAMIC=1 if [ "function" = "$(type -t reexport_flags)" ]; then