Compare commits

..

3 Commits

Author SHA1 Message Date
Jeremy Soller 4b6447cb14
Update relibc 2020-04-10 17:09:38 -06:00
Jeremy Soller f71d233cb0 Merge branch 'cbindgen' into 'master'
Simplify relibc install steps (submodule needs to be updated once relibc commit is in)

See merge request redox-os/redox!1232
2020-04-10 23:08:26 +00:00
Graham MacDonald cfc3d24fe5 Simplify relibc install steps 2020-03-29 10:41:51 +01:00
2 changed files with 1 additions and 5 deletions

View File

@ -38,8 +38,6 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install
cd "$<" && \ cd "$<" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CARGO="env -u CARGO xargo" && \ export CARGO="env -u CARGO xargo" && \
make -j `$(NPROC)` headers && \
make -j `$(NPROC)` install-headers DESTDIR="$(ROOT)/$@.partial/$(TARGET)" && \
make -j `$(NPROC)` all && \ make -j `$(NPROC)` all && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
cd "$@.partial" && $(PREFIX_STRIP) cd "$@.partial" && $(PREFIX_STRIP)
@ -192,8 +190,6 @@ $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $
cd "$<" && \ cd "$<" && \
export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \ export PATH="$(PREFIX_BASE_INSTALL):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
export CARGO="env -u CARGO xargo" && \ export CARGO="env -u CARGO xargo" && \
make -j `$(NPROC)` headers && \
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" && \
make -j `$(NPROC)` all && \ make -j `$(NPROC)` all && \
make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)" make -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"

2
relibc

@ -1 +1 @@
Subproject commit 701e64b3a1e6899e94190c84ee301474039446b9 Subproject commit cdbbd4a426c81cb3dd83db87ee992d59f667f7c5