diff --git a/mk/prefix.mk b/mk/prefix.mk index 8d2bd8da2..ca30dc94c 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -39,10 +39,11 @@ ifeq ($(PODMAN_BUILD),1) else @echo "\033[1;36;49mBuilding relibc-install\033[0m" rm -rf "$@.partial" "$@" - cp -r "$(PREFIX)/rust-install" "$@.partial" - rm -rf "$@.partial/$(TARGET)/include/"* - cp -r "$(PREFIX)/rust-install/$(GNU_TARGET)/include/c++" "$@.partial/$(GNU_TARGET)/include/c++" - cp -r "$(PREFIX)/rust-install/lib/rustlib/$(HOST_TARGET)/lib/" "$@.partial/lib/rustlib/$(HOST_TARGET)/" + mkdir "$@.partial" + cp -r "$(PREFIX)/gcc-install/". "$@.partial" + cp -r "$(PREFIX)/rust-install/". "$@.partial" + rm -rf "$@.partial/$(GNU_TARGET)/include/"* + cp -r "$(PREFIX)/gcc-install/$(GNU_TARGET)/include/c++" "$@.partial/$(GNU_TARGET)/include/c++" export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export CARGO="env -u CARGO cargo" $(PREFIX_CONFIG) && \ ./target/release/repo cook relibc diff --git a/recipes/dev/llvm21/recipe.toml b/recipes/dev/llvm21/recipe.toml index 318719ea6..6b87a1b42 100644 --- a/recipes/dev/llvm21/recipe.toml +++ b/recipes/dev/llvm21/recipe.toml @@ -59,8 +59,6 @@ COOKBOOK_CMAKE_FLAGS+=( -DUNIX=1 ) -# Native tablegen build fails with too many jobs, limit to 16 -COOKBOOK_MAKE_JOBS="$(( ${COOKBOOK_MAKE_JOBS} > 16 ? 16 : ${COOKBOOK_MAKE_JOBS} ))" COOKBOOK_SOURCE="$COOKBOOK_SOURCE/llvm" cookbook_cmake """ diff --git a/recipes/dev/rust/recipe.toml b/recipes/dev/rust/recipe.toml index 4f8038843..254daddbc 100644 --- a/recipes/dev/rust/recipe.toml +++ b/recipes/dev/rust/recipe.toml @@ -9,7 +9,7 @@ dependencies = [ "llvm21", "zlib", "curl", - "openssl1", + "openssl3", ] dev-dependencies = [ "llvm21.dev",