Explorar el Código

Makefile: use nightly toolchain

aggstam hace 3 años
padre
commit
abc8290b9f
Se han modificado 5 ficheros con 11 adiciones y 6 borrados
  1. 1 1
      Makefile
  2. 7 2
      README.md
  3. 1 1
      src/contract/consensus/Makefile
  4. 1 1
      src/contract/dao/Makefile
  5. 1 1
      src/contract/money/Makefile

+ 1 - 1
Makefile

@@ -4,7 +4,7 @@
 PREFIX = $(HOME)/.cargo
 
 # Cargo binary
-CARGO = cargo
+CARGO = cargo +nightly
 
 # Optional compile target
 #RUST_TARGET = x86_64-unknown-linux-musl

+ 7 - 2
README.md

@@ -32,8 +32,13 @@ for the P2P IRC daemon.
 This project requires the Rust compiler to be installed. 
 Please visit [Rustup](https://rustup.rs/) for instructions.
 
-You have to install a native toolchain, which is set up during Rust installation, and wasm32 toolchain.
-To install wasm32 toolchain, execute:
+You have to install a native toolchain, which is set up during Rust installation,
+nightly toolchain and wasm32 target.
+To install nightly toolchain, execute:
+```shell
+% rustup toolchain install nightly
+```
+To install wasm32 target, execute:
 ```shell
 % rustup target add wasm32-unknown-unknown
 ```

+ 1 - 1
src/contract/consensus/Makefile

@@ -1,7 +1,7 @@
 .POSIX:
 
 # Cargo binary
-CARGO = cargo
+CARGO = cargo +nightly
 
 # zkas compiler binary
 ZKAS = ../../../zkas

+ 1 - 1
src/contract/dao/Makefile

@@ -1,7 +1,7 @@
 .POSIX:
 
 # Cargo binary
-CARGO = cargo
+CARGO = cargo +nightly
 
 # zkas compiler binary
 ZKAS = ../../../zkas

+ 1 - 1
src/contract/money/Makefile

@@ -1,7 +1,7 @@
 .POSIX:
 
 # Cargo binary
-CARGO = cargo
+CARGO = cargo +nightly
 
 # zkas compiler binary
 ZKAS = ../../../zkas