From 4f70981463c58283ea8ffed1c478c324023a7cbc Mon Sep 17 00:00:00 2001 From: Anhad Singh Date: Mon, 10 Feb 2025 23:22:28 +1100 Subject: [PATCH] feat(rustc): dynamic Signed-off-by: Anhad Singh --- recipes/dev/rust/config.toml | 4 ++-- recipes/dev/rust/recipe.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/dev/rust/config.toml b/recipes/dev/rust/config.toml index 180cfd09d..0a05f38c2 100644 --- a/recipes/dev/rust/config.toml +++ b/recipes/dev/rust/config.toml @@ -1,6 +1,6 @@ [llvm] download-ci-llvm = false -static-libstdcpp = true +static-libstdcpp = false [build] host = ["x86_64-unknown-redox"] @@ -26,4 +26,4 @@ ar = "x86_64-unknown-redox-ar" linker = "x86_64-unknown-redox-gcc" # Nasty path, please fix llvm-config = "../../../../bin/x86_64-unknown-redox-llvm-config" -crt-static = true +crt-static = false diff --git a/recipes/dev/rust/recipe.sh b/recipes/dev/rust/recipe.sh index fb417a310..33b80e486 100644 --- a/recipes/dev/rust/recipe.sh +++ b/recipes/dev/rust/recipe.sh @@ -1,6 +1,6 @@ GIT=https://gitlab.redox-os.org/redox-os/rust.git BRANCH=redox-2024-05-11 -BUILD_DEPENDS=(llvm18) +BUILD_DEPENDS=(llvm18-shared zlib libgcc) DEPENDS="gcc13 cargo" PREPARE_COPY=0 @@ -11,6 +11,7 @@ function recipe_version { function recipe_build { unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP + export MAGIC_EXTRA_RUSTFLAGS="-C link-args=-lz" python3 "${COOKBOOK_SOURCE}/x.py" install --config "${COOKBOOK_RECIPE}/config.toml" --jobs $(nproc) --incremental skip=1 }