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

Merge branch 'xargo-fix' into 'master'

Browse source 
Fix xargo deadlock

See merge request redox-os/redox!1219
This commit is contained in:
Jeremy Soller 2019-08-10 16:34:02 +00:00
commit 26ab864d01
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/prefix.mk
View file

@ -37,7 +37,7 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install
cp -r "$(PREFIX)/gcc-install" "$@.partial" cp -r "$(PREFIX)/gcc-install" "$@.partial"
cd "$<" && \ cd "$<" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CARGO=xargo && \ export CARGO="env -u CARGO xargo" && \
make -j `$(NPROC)` headers && \ make -j `$(NPROC)` headers && \
make -j `$(NPROC)` install-headers DESTDIR="$(ROOT)/$@.partial/$(TARGET)" && \ make -j `$(NPROC)` install-headers DESTDIR="$(ROOT)/$@.partial/$(TARGET)" && \
make -j `$(NPROC)` all && \ make -j `$(NPROC)` all && \
@ -191,7 +191,7 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
mkdir -p "$@.partial" mkdir -p "$@.partial"
cd "$<" && \ cd "$<" && \
export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \ export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export CARGO=xargo && \ export CARGO="env -u CARGO xargo" && \
make -j `$(NPROC)` headers && \ make -j `$(NPROC)` headers && \
make -j `$(NPROC)` install-headers DESTDIR="$(ROOT)/$@.partial/$(TARGET)" && \ make -j `$(NPROC)` install-headers DESTDIR="$(ROOT)/$@.partial/$(TARGET)" && \
export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \ export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \