Commit ed649dec authored by John Hodge's avatar John Hodge
Browse files

Switch user/kernel to xargo

parent 8c81907f
......@@ -5,14 +5,12 @@ run: all
make -C Kernel/rundir run
all:
@echo ">>> [email protected]: libcore source"
@+make -C Kernel/ ../libcore/lib.rs --no-print-directory
@echo ">>> [email protected]: Graphics"
@make -C Graphics/ all
@echo ">>> [email protected]: Usermode"
@+make -C Usermode/ all --no-print-directory
@+make -C Usermode/ xargo --no-print-directory
@echo ">>> [email protected]: Kernel"
@+make -C Kernel/ all --no-print-directory
@+make -C Kernel/ -f Makefile-xargo all --no-print-directory
clean:
@echo ">>> [email protected]: Usermode"
......@@ -26,7 +24,7 @@ UPDATE:
curl https://static.rust-lang.org/rustup/rustup-init.sh -sSf | RUSTUP_HOME=$(abspath .prefix) CARGO_HOME=$(abspath .prefix) sh -s -- --default-toolchain none --no-modify-path -y
$(call fn_rustcmd,rustup) update $(RUSTUP_VER)
$(call fn_rustcmd,rustup) default $(RUSTUP_VER)
curl $(RUSTC_SRC_URL) -o rustc-nightly-src.tar.gz
tar -xf rustc-nightly-src.tar.gz --wildcards rustc-nightly-src/src/lib\* rustc-nightly-src/src/stdsimd rustc-nightly-src/vendor/compiler_builtins
rm -rf rustc-nightly-src/src/libcompiler_builtins; mv rustc-nightly-src/vendor/compiler_builtins rustc-nightly-src/src/libcompiler_builtins
# curl $(RUSTC_SRC_URL) -o rustc-nightly-src.tar.gz
# tar -xf rustc-nightly-src.tar.gz --wildcards rustc-nightly-src/src/lib\* rustc-nightly-src/src/stdsimd rustc-nightly-src/vendor/compiler_builtins
# rm -rf rustc-nightly-src/src/libcompiler_builtins; mv rustc-nightly-src/vendor/compiler_builtins rustc-nightly-src/src/libcompiler_builtins
$(CARGO) install xargo --git https://github.com/thepowersgang/xargo --force
......@@ -49,5 +49,4 @@ XARGO := XARGO_HOME=$(abspath $(PREFIX)xargo) $(call fn_rustcmd,xargo)
# NOTE: rustc-src doesn't contain compiler_builtins (which is a crates.io package)
#RUSTUP_SRC_DIR = $(firstword $(wildcard $(PREFIX)toolchains/nightly-*/lib/rustlib/src/rust/src))/
RUSTUP_SRC_DIR := $(abspath $(ROOTDIR)/rustc-nightly-src/src)/
$(warning $(RUSTUP_SRC_DIR))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment