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

Fix kernel output

Browse source
This commit is contained in:
Jeremy Soller 2017-02-07 19:48:50 -07:00
parent 20f0003e01
commit 2d25d58482
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk/kernel.mk
View file

@ -4,10 +4,10 @@ $(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libco
cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD) cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD)
$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs $(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs
$(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) -C lto --emit obj=$@ $(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) -C lto -o $@
$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs build/filesystem.bin $(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs build/filesystem.bin
$(KCARGO) rustc --manifest-path $< --lib --features live $(KCARGOFLAGS) -C lto --emit obj=$@ $(KCARGO) rustc --manifest-path $< --lib --features live $(KCARGOFLAGS) -C lto -o $@
$(KBUILD)/kernel: $(KBUILD)/libkernel.a $(KBUILD)/kernel: $(KBUILD)/libkernel.a
$(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $< $(LD) $(LDFLAGS) -z max-page-size=0x1000 -T kernel/arch/$(ARCH)/src/linker.ld -o $@ $<