Make build work with rustc 1.37 stable and RUSTC_BOOTSTRAP=1 (#3844)

* Make build work with rustc 1.37 stable and RUSTC_BOOTSTRAP=1

* Bump versions to run CI
This commit is contained in:
Ximin Luo
2019-10-18 16:15:05 +01:00
committed by Gavin Wood
parent 3963bb58ff
commit b618d8f0b2
3 changed files with 8 additions and 4 deletions
-1
View File
@@ -14,7 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
#[cfg(feature = "nightly")]
#[doc(hidden)]
pub extern crate alloc;
@@ -16,6 +16,7 @@
use std::{process::{Command, Stdio}, fs};
use std::env;
use tempfile::tempdir;
/// Checks that all prerequisites are installed.
@@ -23,7 +24,7 @@ use tempfile::tempdir;
/// # Returns
/// Returns `None` if everything was found and `Some(ERR_MSG)` if something could not be found.
pub fn check() -> Option<&'static str> {
if !check_nightly_installed() {
if !rustc_stable_forced_to_nightly() && !check_nightly_installed(){
return Some("Rust nightly not installed, please install it!")
}
@@ -39,6 +40,10 @@ pub fn check() -> Option<&'static str> {
check_wasm_toolchain_installed()
}
fn rustc_stable_forced_to_nightly() -> bool {
env::var("RUSTC_BOOTSTRAP") == Ok("1".to_string())
}
fn check_nightly_installed() -> bool {
let command = crate::get_nightly_cargo();
command.is_nightly()
+2 -2
View File
@@ -84,8 +84,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to equal spec_version. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 178,
impl_version: 178,
spec_version: 179,
impl_version: 179,
apis: RUNTIME_API_VERSIONS,
};