Skip to content

Commit 4e9f202

Browse files
zhangsoledaddoitian
authored andcommitted
feat: upgrade to rust 1.31.1
1 parent 8d82ac2 commit 4e9f202

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ env:
1414
matrix:
1515
include:
1616
- os: osx
17-
rust: 1.31.0
17+
rust: 1.31.1
1818
install:
1919
- cargo fmt --version || rustup component add rustfmt
2020
- cargo clippy --version || rustup component add clippy
2121
env: SUITE=ci
22-
- rust: 1.31.0
22+
- rust: 1.31.1
2323
addons:
2424
apt:
2525
packages:

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), an
3232

3333
## Build dependencies
3434

35-
CKB is currently tested mainly with `stable-1.31.0` on Linux and Mac OSX.
35+
CKB is currently tested mainly with `stable-1.31.1` on Linux and Mac OSX.
3636

3737
We recommend installing Rust through [rustup](https://www.rustup.rs/)
3838

3939
```bash
4040
# Get rustup from rustup.rs, then in your `ckb` folder:
41-
rustup override set 1.31.0
41+
rustup override set 1.31.1
4242
rustup component add rustfmt
4343
rustup component add clippy
4444
```
@@ -50,20 +50,13 @@ You also need to get the following packages:
5050
* Ubuntu and Debian:
5151

5252
```shell
53-
sudo apt-get install git autoconf flex bison texinfo libtool pkg-config libssl-dev libclang-dev
54-
```
55-
56-
If you are on Ubuntu 18.04, you might run into `'stdarg.h' file not found` error, this is because `librocksdb-sys` fails to find the correct include path. A temporary fix until `librocksdb-sys` fixes this problem is as follows:
57-
58-
```shell
59-
sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stdarg.h /usr/include/stdarg.h
60-
sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stddef.h /usr/include/stddef.h
53+
sudo apt-get install git gcc libc6-dev pkg-config libssl-dev libclang-dev clang
6154
```
6255

6356
* Archlinux
6457

6558
```shell
66-
sudo pacman -Sy git autoconf flex bison texinfo libtool pkg-config openssl-1.0 clang
59+
sudo pacman -Sy git gcc pkgconf openssl-1.0 clang
6760
```
6861

6962
If you get openssl related errors in compiling, try the following environment variables to specify openssl-1.0:

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.31.0
1+
1.31.1

0 commit comments

Comments
 (0)