mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-20 20:04:19 +08:00
Further fixes to make gcc13 compile
This commit is contained in:
parent
0ad7cae812
commit
2fe4fdc2fb
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user