M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

conda: update rustc to 1.23.0.

This commit is contained in:
whitequark 2018-01-08 21:39:15 +00:00
parent 8813aee6b1
commit 987a9c8308
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/firmware/Cargo.toml
View File

@ -1,2 +1,5 @@
[workspace] [workspace]
members = ["bootloader", "runtime", "ksupport", "satman"] members = ["bootloader", "runtime", "ksupport", "satman"]
[profile.dev]
debug = 1 # either 0 or 2 cause an LLVM ICE

3
conda/artiq-dev/meta.yaml
View File

@ -21,8 +21,7 @@ requirements:
- binutils-or1k-linux >=2.27 - binutils-or1k-linux >=2.27
- llvm-or1k 4.0.1 - llvm-or1k 4.0.1
- llvmlite-artiq 0.20.0 - llvmlite-artiq 0.20.0
- rustc 1.22.1 17 - rust-core-or1k 1.23.0 19
- rust-core-or1k 1.22.1 18
- openocd 0.10.0+git1 - openocd 0.10.0+git1
- lit - lit
- outputcheck - outputcheck