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

Allow rustdoc

Browse source
This commit is contained in:
Jeremy Soller 2016-10-16 14:06:01 -06:00
parent 25fb1427ab
commit 2e575db3db
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -5,7 +5,8 @@ KTARGET=$(ARCH)-unknown-none
KBUILD=build/kernel KBUILD=build/kernel
KRUSTC=./krustc.sh KRUSTC=./krustc.sh
KRUSTCFLAGS=--target $(KTARGET).json -C opt-level=s -C soft-float KRUSTCFLAGS=--target $(KTARGET).json -C opt-level=s -C soft-float
KCARGO=RUSTC="$(KRUSTC)" cargo KRUSTDOC=./krustdoc.sh
KCARGO=RUSTC="$(KRUSTC)" RUSTDOC="$(KRUSTDOC)" cargo
KCARGOFLAGS=--target $(KTARGET).json -- -C opt-level=s -C soft-float KCARGOFLAGS=--target $(KTARGET).json -- -C opt-level=s -C soft-float
# Userspace variables # Userspace variables
@ -13,11 +14,12 @@ TARGET=$(ARCH)-unknown-redox
BUILD=build/userspace BUILD=build/userspace
RUSTC=./rustc.sh RUSTC=./rustc.sh
RUSTCFLAGS=--target $(TARGET).json -C opt-level=s --cfg redox RUSTCFLAGS=--target $(TARGET).json -C opt-level=s --cfg redox
CARGO=RUSTC="$(RUSTC)" cargo RUSTDOC=./rustdoc.sh
CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS=--target $(TARGET).json -- -C opt-level=s --cfg redox CARGOFLAGS=--target $(TARGET).json -- -C opt-level=s --cfg redox
# Default targets # Default targets
.PHONY: all clean update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE .PHONY: all clean doc update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE
all: $(KBUILD)/harddrive.bin all: $(KBUILD)/harddrive.bin
@ -48,6 +50,9 @@ clean:
rm -rf filesystem/bin rm -rf filesystem/bin
rm -rf build rm -rf build
doc: $(KBUILD)/libkernel.a
$(KCARGO) doc --target $(KTARGET).json
update: update:
cargo update cargo update
cargo update --manifest-path libstd/Cargo.toml cargo update --manifest-path libstd/Cargo.toml

2
krustdoc.sh Executable file
View file

@ -0,0 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustdoc -L build/kernel --cfg redox $*

2
rustdoc.sh Executable file
View file

@ -0,0 +1,2 @@
#!/bin/bash
RUST_BACKTRACE=1 rustdoc -L build/userspace --cfg redox $*