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

firmware: remove cargo profiles. 

These are specified per-workspace, and anyhow are mostly overridden
by our Makefile, so specify everything in it.
This commit is contained in:
whitequark 2016-12-29 13:01:49 +00:00
parent 9df7932169
commit aed91292e2
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/libksupport/Cargo.toml
View File

@ -12,7 +12,3 @@ crate-type = ["staticlib"]
std_artiq = { path = "../libstd_artiq" } std_artiq = { path = "../libstd_artiq" }
bsp = { path = "../libbsp" } bsp = { path = "../libbsp" }
byteorder = { version = "0.5", default-features = false } byteorder = { version = "0.5", default-features = false }
[profile.dev]
panic = 'unwind'
opt-level = 2

4
artiq/firmware/runtime/Cargo.toml
View File

@ -20,7 +20,3 @@ fringe = { version = "= 1.1.0", default-features = false, features = ["alloc"] }
log = { version = "0.3", default-features = false } log = { version = "0.3", default-features = false }
log_buffer = { version = "1.0" } log_buffer = { version = "1.0" }
byteorder = { version = "0.5", default-features = false } byteorder = { version = "0.5", default-features = false }
[profile.dev]
panic = 'abort'
opt-level = 2

4
artiq/runtime/Makefile
View File

@ -38,7 +38,7 @@ $(RUSTOUT_DIRECTORY)/libruntime.a: ksupport.elf
--manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/runtime/Cargo.toml) \ --manifest-path $(realpath $(RUNTIME_DIRECTORY)/../firmware/runtime/Cargo.toml) \
--target=or1k-unknown-none -- \ --target=or1k-unknown-none -- \
$(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \ $(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \
-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s \ -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=abort \
-L../libcompiler-rt -L../libcompiler-rt
runtime.elf: $(OBJECTS) $(RUSTOUT_DIRECTORY)/libruntime.a runtime.elf: $(OBJECTS) $(RUSTOUT_DIRECTORY)/libruntime.a
@ -57,7 +57,7 @@ $(RUSTOUT_DIRECTORY)/libksupport.a:
--target=or1k-unknown-none -- \ --target=or1k-unknown-none -- \
$(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \ $(shell cat $(BUILDINC_DIRECTORY)/generated/rust-cfg) \
--cfg ksupport \ --cfg ksupport \
-C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s \ -C target-feature=+mul,+div,+ffl1,+cmov,+addc -C opt-level=s -Cpanic=unwind \
-L../libcompiler-rt -L../libcompiler-rt
ksupport.elf: $(OBJECTS_KSUPPORT) $(RUSTOUT_DIRECTORY)/libksupport.a ksupport.elf: $(OBJECTS_KSUPPORT) $(RUSTOUT_DIRECTORY)/libksupport.a