diff --git a/mk/prefix.mk b/mk/prefix.mk index 276634b6..92fbf522 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -25,7 +25,7 @@ prefix_clean: | $(FSTOOLS_TAG) rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG) $(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs,relibc -$(PREFIX)/relibc-install: $(PREFIX)/rust-install | $(CONTAINER_TAG) +$(PREFIX)/relibc-install: $(PREFIX)/rust-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 305562d6..19866f01 100644 --- a/recipes/dev/gcc13/recipe.toml +++ b/recipes/dev/gcc13/recipe.toml @@ -17,7 +17,7 @@ dependencies = [ "zlib" ] script = """ -DYNAMIC_INIT +DYNAMIC_STATIC_INIT CROSS_GNU_TARGET=${COOKBOOK_CROSS_GNU_TARGET:-$GNU_TARGET} if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then @@ -27,12 +27,12 @@ COOKBOOK_CONFIGURE_FLAGS=( --prefix="" --host="${GNU_TARGET}" --program-prefix="${CROSS_GNU_TARGET}-" + --with-native-system-header-dir="/include" --with-sysroot ) else COOKBOOK_CONFIGURE_FLAGS+=( - --with-sysroot=/usr - --prefix="/usr" + --with-sysroot=/ ) fi @@ -46,7 +46,6 @@ fi COOKBOOK_CONFIGURE_FLAGS+=( --target="${CROSS_GNU_TARGET}" --with-build-sysroot="${COOKBOOK_CROSS_SYSROOT:-$COOKBOOK_SYSROOT}" - --with-native-system-header-dir="/include" --with-linker-hash-style=gnu --enable-languages=c,c++,lto --enable-initfini-array diff --git a/recipes/libs/libstdcxx-v3/recipe.toml b/recipes/libs/libstdcxx-v3/recipe.toml index 89262921..9499cd8e 100644 --- a/recipes/libs/libstdcxx-v3/recipe.toml +++ b/recipes/libs/libstdcxx-v3/recipe.toml @@ -4,7 +4,7 @@ same_as = "../../dev/gcc13" [build] template = "custom" script = """ -DYNAMIC_INIT +DYNAMIC_STATIC_INIT # this results C++ missing nice stuff like mutex # our prefix workaround this by compiling twice