diff --git a/mk/prefix.mk b/mk/prefix.mk index 25de10c52..6bc1dfbca 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -412,7 +412,7 @@ else # TODO: Cache from WASIP1_LIBC_TARGET is currently not cleared. endif -$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else @@ -431,7 +431,7 @@ endif endif # BUILD CLANG --------------------------------------------------- -$(PREFIX)/clang-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG) +$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else diff --git a/recipes/dev/gcc13/recipe.toml b/recipes/dev/gcc13/recipe.toml index 5b408a9f1..d6103ed2a 100644 --- a/recipes/dev/gcc13/recipe.toml +++ b/recipes/dev/gcc13/recipe.toml @@ -4,7 +4,12 @@ branch = "redox-13.2.0" shallow_clone = true script = """ DYNAMIC_INIT -COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)" +export COOKBOOK_AUTORECONF=$( + command -v autoreconf2.69 2>/dev/null || \\ + (autoreconf --version 2>/dev/null | grep -q '2\\.69' && command -v autoreconf) || \\ + (echo "Error: Autoconf 2.69 required" >&2; exit 1) +) +autotools_recursive_regenerate -I"$(realpath ./config)" LIBTOOL_BUILD_AUX="${COOKBOOK_LIBTOOL_DIR:-$COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} libiberty/ cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} zlib/contrib/minizip/ diff --git a/recipes/tools/gnu-binutils/recipe.toml b/recipes/tools/gnu-binutils/recipe.toml index b0a4f96d6..6366a7235 100644 --- a/recipes/tools/gnu-binutils/recipe.toml +++ b/recipes/tools/gnu-binutils/recipe.toml @@ -4,8 +4,12 @@ blake3 = "f074c81313b70eabc58ce9a9411cd771c5fa2433792d0ad8abcc45f603f58ed6" patches = ["01_build_fix.patch"] script = """ DYNAMIC_INIT - -COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)" +export COOKBOOK_AUTORECONF=$( + command -v autoreconf2.69 2>/dev/null || \\ + (autoreconf --version 2>/dev/null | grep -q '2\\.69' && command -v autoreconf) || \\ + (echo "Error: Autoconf 2.69 required" >&2; exit 1) +) +autotools_recursive_regenerate -I"$(realpath ./config)" cp -fpv ${COOKBOOK_HOST_SYSROOT}/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/ """