From ba22ff943fbd84eb263a93b2843adb11521f6d57 Mon Sep 17 00:00:00 2001 From: John Hodge <tpg@mutabah.net> Date: Sun, 17 Mar 2019 09:27:19 +0800 Subject: [PATCH] Root Makefile - Use xargo from my fork (has fancy support) --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d5095cfe..552ec444 100644 --- a/Makefile +++ b/Makefile @@ -22,15 +22,11 @@ clean: UPDATE: @echo ">>> Updating rustc and libcore" - #@make -C Kernel/ UPDATE --no-print-directory - #@make -C Kernel/ ../libcore/lib.rs --no-print-directory - # @mkdir -p .prefix 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) - #$(call fn_rustcmd,rustup) component add rust-src 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 - test -f .prefix/bin/xargo || $(CARGO) install xargo + $(CARGO) install xargo --git https://github.com/thepowersgang/xargo --force -- GitLab