srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

runtime: reduce the amount of noise during build.

This commit is contained in:
whitequark 2017-01-17 05:56:14 +00:00
parent 527b1e986c
commit 15ba6f36ba
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
artiq/runtime/Makefile
View File

@ -3,6 +3,15 @@ include $(MISOC_DIRECTORY)/software/common.mak
PYTHON ?= python3.5 PYTHON ?= python3.5
CARGO_normal := env
CARGO_quiet = @echo " CARGO " $@ && $(CARGO_normal)
ifeq ($(V),1)
CARGO = $(CARGO_normal)
else
CARGO = $(CARGO_quiet)
endif
RUSTOUT := cargo/or1k-unknown-none/debug RUSTOUT := cargo/or1k-unknown-none/debug
RUSTOUT_KSUPPORT := cargo-ksupport/or1k-unknown-none/debug RUSTOUT_KSUPPORT := cargo-ksupport/or1k-unknown-none/debug
@ -24,10 +33,11 @@ all: runtime.bin runtime.fbi
.PHONY: $(RUSTOUT)/libruntime.a .PHONY: $(RUSTOUT)/libruntime.a
$(RUSTOUT)/libruntime.a: $(RUSTOUT)/libruntime.a:
RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=abort" \ $(CARGO) \
CARGO_TARGET_DIR=$(realpath .)/cargo \ RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=abort" \
cargo build --target=or1k-unknown-none \ CARGO_TARGET_DIR=$(realpath .)/cargo \
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/runtime/Cargo.toml) cargo build --target=or1k-unknown-none \
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/runtime/Cargo.toml)
runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o
$(LD) $(LDFLAGS) \ $(LD) $(LDFLAGS) \
@ -39,10 +49,11 @@ runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o
.PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a .PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a
$(RUSTOUT_KSUPPORT)/libksupport.a: $(RUSTOUT_KSUPPORT)/libksupport.a:
RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \ $(CARGO) \
CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \ RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \
cargo build --target=or1k-unknown-none \ CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/libksupport/Cargo.toml) cargo build --target=or1k-unknown-none \
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/libksupport/Cargo.toml)
ksupport.elf: $(RUSTOUT_KSUPPORT)/libksupport.a ksupport_glue.o artiq_personality.o ksupport.elf: $(RUSTOUT_KSUPPORT)/libksupport.a ksupport_glue.o artiq_personality.o
$(LD) $(LDFLAGS) \ $(LD) $(LDFLAGS) \