MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-05 11:08:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further fixes to make gcc13 compile

Browse Source
This commit is contained in:
Wildan M 2025-12-25 16:21:19 +07:00
parent 0ad7cae812
commit 2fe4fdc2fb
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/prefix.mk
View File

@ -25,7 +25,7 @@ prefix_clean: | $(FSTOOLS_TAG)
rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG) rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG)
$(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs,relibc $(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) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else

7
recipes/dev/gcc13/recipe.toml
View File

@ -17,7 +17,7 @@ dependencies = [
"zlib" "zlib"
] ]
script = """ script = """
DYNAMIC_INIT DYNAMIC_STATIC_INIT
CROSS_GNU_TARGET=${COOKBOOK_CROSS_GNU_TARGET:-$GNU_TARGET} CROSS_GNU_TARGET=${COOKBOOK_CROSS_GNU_TARGET:-$GNU_TARGET}
if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
@ -27,12 +27,12 @@ COOKBOOK_CONFIGURE_FLAGS=(
--prefix="" --prefix=""
--host="${GNU_TARGET}" --host="${GNU_TARGET}"
--program-prefix="${CROSS_GNU_TARGET}-" --program-prefix="${CROSS_GNU_TARGET}-"
--with-native-system-header-dir="/include"
--with-sysroot --with-sysroot
) )
else else
COOKBOOK_CONFIGURE_FLAGS+=( COOKBOOK_CONFIGURE_FLAGS+=(
--with-sysroot=/usr --with-sysroot=/
--prefix="/usr"
) )
fi fi
@ -46,7 +46,6 @@ fi
COOKBOOK_CONFIGURE_FLAGS+=( COOKBOOK_CONFIGURE_FLAGS+=(
--target="${CROSS_GNU_TARGET}" --target="${CROSS_GNU_TARGET}"
--with-build-sysroot="${COOKBOOK_CROSS_SYSROOT:-$COOKBOOK_SYSROOT}" --with-build-sysroot="${COOKBOOK_CROSS_SYSROOT:-$COOKBOOK_SYSROOT}"
--with-native-system-header-dir="/include"
--with-linker-hash-style=gnu --with-linker-hash-style=gnu
--enable-languages=c,c++,lto --enable-languages=c,c++,lto
--enable-initfini-array --enable-initfini-array

2
recipes/libs/libstdcxx-v3/recipe.toml
View File

@ -4,7 +4,7 @@ same_as = "../../dev/gcc13"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
DYNAMIC_INIT DYNAMIC_STATIC_INIT
# this results C++ missing nice stuff like mutex # this results C++ missing nice stuff like mutex
# our prefix workaround this by compiling twice # our prefix workaround this by compiling twice