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

Add nobuild qemu, clean smith, update libstd

Browse source
This commit is contained in:
Jeremy Soller 2016-09-28 22:19:18 -06:00
parent 02b5f34165
commit 4943ddf955
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -33,6 +33,7 @@ clean:
cargo clean --manifest-path programs/login/Cargo.toml cargo clean --manifest-path programs/login/Cargo.toml
cargo clean --manifest-path programs/coreutils/Cargo.toml cargo clean --manifest-path programs/coreutils/Cargo.toml
cargo clean --manifest-path programs/extrautils/Cargo.toml cargo clean --manifest-path programs/extrautils/Cargo.toml
cargo clean --manifest-path programs/smith/Cargo.toml
cargo clean --manifest-path schemes/example/Cargo.toml cargo clean --manifest-path schemes/example/Cargo.toml
cargo clean --manifest-path schemes/redoxfs/Cargo.toml cargo clean --manifest-path schemes/redoxfs/Cargo.toml
rm -rf initfs/bin rm -rf initfs/bin
@ -82,6 +83,9 @@ $(KBUILD)/harddrive.bin: $(KBUILD)/kernel $(BUILD)/filesystem.bin bootloader/$(A
qemu: $(KBUILD)/harddrive.bin qemu: $(KBUILD)/harddrive.bin
$(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw,index=0,media=disk $(QEMU) $(QEMUFLAGS) -drive file=$<,format=raw,index=0,media=disk
qemu_no_build:
$(QEMU) $(QEMUFLAGS) -drive file=$(KBUILD)/harddrive.bin,format=raw,index=0,media=disk
endif endif
bochs: $(KBUILD)/harddrive.bin bochs: $(KBUILD)/harddrive.bin

2
libstd

@ -1 +1 @@
Subproject commit 9b2e8ea8196cdf8023fb54e8581f94e45b8dec4f Subproject commit 49ff9f90e0249905c4e93de14acc72803ba72ce9