firmware: libksupport → ksupport.

The idea is that support libraries are called lib*, and the final products that linked into an executable are not.
2017-01-31 22:24:37 +00:00 · 2017-01-31 22:24:37 +00:00 · bc22d1c009
parent 7a14cf503b
commit bc22d1c009
8 changed files with 3 additions and 3 deletions
--- a/artiq/firmware/Cargo.toml
+++ b/artiq/firmware/Cargo.toml
@ -1,2 +1,2 @@
 [workspace]
-members = ["runtime", "libksupport", "satman"]
+members = ["runtime", "ksupport", "satman"]
--- a/artiq/firmware/libksupport/Cargo.toml
+++ b/artiq/firmware/libksupport/Cargo.toml
--- a/artiq/firmware/libksupport/api.rs
+++ b/artiq/firmware/libksupport/api.rs
--- a/artiq/firmware/libksupport/build.rs
+++ b/artiq/firmware/libksupport/build.rs
--- a/artiq/firmware/libksupport/dyld.rs
+++ b/artiq/firmware/libksupport/dyld.rs
--- a/artiq/firmware/libksupport/lib.rs
+++ b/artiq/firmware/libksupport/lib.rs
--- a/artiq/firmware/libksupport/rtio.rs
+++ b/artiq/firmware/libksupport/rtio.rs
--- a/artiq/runtime/Makefile
+++ b/artiq/runtime/Makefile
@ -48,12 +48,12 @@ runtime.elf: $(RUSTOUT)/libruntime.a flash_storage.o ksupport_data.o
 	@chmod -x $@
 .PHONY: $(RUSTOUT_KSUPPORT)/libksupport.a
-$(RUSTOUT_KSUPPORT)/libksupport.a:
+$(RUSTOUT_KSUPPORT)/ksupport.a:
 	$(CARGO) \
 		RUSTFLAGS="-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind" \
 		CARGO_TARGET_DIR=$(realpath .)/cargo-ksupport \
 			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
 	$(LD) $(LDFLAGS) \
`@ -1,2 +1,2 @@`
	`[workspace]`	`[workspace]`
	`members = ["runtime", "libksupport", "satman"]`	`members = ["runtime", "ksupport", "satman"]`