vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox

Browse source
This commit is contained in:
Jeremy Soller 2025-01-13 14:32:26 -07:00
parent adf504d3b2 74f0a0eea1
commit 65e5d3a2b7
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/prefix.mk
View file

@ -110,6 +110,7 @@ ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) $(MAKE) $@ $(PODMAN_RUN) $(MAKE) $@
else else
cp -r "$(PREFIX)/relibc-install/" "$@" cp -r "$(PREFIX)/relibc-install/" "$@"
touch "$@"
cd "$(PREFIX)/libtool-build" && \ cd "$(PREFIX)/libtool-build" && \
$(MAKE) install -j `$(NPROC)` $(MAKE) install -j `$(NPROC)`
cd "$@" && $(PREFIX_STRIP) cd "$@" && $(PREFIX_STRIP)
@ -168,6 +169,7 @@ else
--program-prefix="$(GNU_TARGET)-" \ --program-prefix="$(GNU_TARGET)-" \
--prefix="" \ --prefix="" \
--disable-werror \ --disable-werror \
--enable-default-hash-style=gnu \
&& \ && \
$(MAKE) -j `$(NPROC)` all && \ $(MAKE) -j `$(NPROC)` all && \
$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" $(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
@ -208,6 +210,7 @@ else
--disable-shared \ --disable-shared \
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--without-headers \ --without-headers \
--with-linker-hash-style=gnu \
&& \ && \
$(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc && \ $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc && \
$(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc DESTDIR="$(ROOT)/$@.partial" $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc DESTDIR="$(ROOT)/$@.partial"
@ -297,6 +300,7 @@ else
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--enable-shared \ --enable-shared \
--enable-threads=posix \ --enable-threads=posix \
--with-linker-hash-style=gnu \
&& \ && \
$(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \
$(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial"