about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-10-17 23:07:52 +0200
committerGitHub <noreply@github.com>2016-10-17 23:07:52 +0200
commit1aac569e8a363b87fa34580d3082d35e515aff8f (patch)
tree8df1d017e5068e4342739e2cbc7ba588f33b2feb
parent2b634949a3ba9e19688a33eb25ba824112fca3b2 (diff)
parente4e444a26ba1597f99e4537f2aaa389509543efc (diff)
downloadrust-1aac569e8a363b87fa34580d3082d35e515aff8f.tar.gz
rust-1aac569e8a363b87fa34580d3082d35e515aff8f.zip
Rollup merge of #37177 - michaelwoerister:fix-check-stage1, r=petrochenkov
Fix make check-stage1 by conditionally activating question_mark feature for compiletest tool.

r? @alexcrichton
-rw-r--r--src/tools/compiletest/src/main.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 81478c18d7b..e6efd45cad1 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -15,6 +15,8 @@
 #![feature(test)]
 #![feature(libc)]
 
+#![cfg_attr(stage0, feature(question_mark))]
+
 #![deny(warnings)]
 
 extern crate libc;