forked from M-Labs/artiq
1
0
Fork 0

firmware: libksupport → ksupport.

The idea is that support libraries are called lib*, and the final
products that linked into an executable are not.
This commit is contained in:
whitequark 2017-01-31 22:24:37 +00:00
parent 7a14cf503b
commit bc22d1c009
8 changed files with 3 additions and 3 deletions

View File

@ -1,2 +1,2 @@
[workspace] [workspace]
members = ["runtime", "libksupport", "satman"] members = ["runtime", "ksupport", "satman"]

View File

@ -48,12 +48,12 @@ runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o
@chmod -x $@ @chmod -x $@
.PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a .PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a
$(RUSTOUT_KSUPPORT)/libksupport.a: $(RUSTOUT_KSUPPORT)/ksupport.a:
$(CARGO) \ $(CARGO) \
RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \ RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \
CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \ CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \
cargo build --target=or1k-unknown-none \ cargo build --target=or1k-unknown-none \
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/libksupport/Cargo.toml) --manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/ksupport/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) \