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

Upgrade cookbook, revert Rust, clean cookbook in make clean, put xargo build in subfolder

Browse source
This commit is contained in:
Jeremy Soller 2017-06-19 20:15:56 -06:00
parent 54f4078a89
commit 672f8b8297
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -8,6 +8,7 @@ live: build/livedisk.bin
iso: build/livedisk.iso iso: build/livedisk.iso
clean: clean:
cd cookbook && ./clean.sh
cargo clean --manifest-path cookbook/pkgutils/Cargo.toml cargo clean --manifest-path cookbook/pkgutils/Cargo.toml
cargo clean --manifest-path installer/Cargo.toml cargo clean --manifest-path installer/Cargo.toml
cargo clean --manifest-path installer/redoxfs/Cargo.toml cargo clean --manifest-path installer/redoxfs/Cargo.toml

2
cookbook

@ -1 +1 @@
Subproject commit 8da49359fe6402c24446c9b8042530dfccde28d3 Subproject commit ae09d5afbcf8b875f4bce30ffe9de70286832efb

1
mk/config.mk
View file

@ -25,6 +25,7 @@ endif
ROOT=$(PWD) ROOT=$(PWD)
export INITFS_FOLDER=$(ROOT)/build/initfs export INITFS_FOLDER=$(ROOT)/build/initfs
export RUST_TARGET_PATH=$(ROOT)/kernel/targets export RUST_TARGET_PATH=$(ROOT)/kernel/targets
export XARGO_HOME=$(ROOT)/build/xargo
export XARGO_RUST_SRC=$(ROOT)/rust/src export XARGO_RUST_SRC=$(ROOT)/rust/src
# Kernel variables # Kernel variables

2
rust

@ -1 +1 @@
Subproject commit 247a0184ff972f1205017185f6917a03b15e7be4 Subproject commit 4bf5c99afc75f411a4e064150781eefc749c10df