auto merge of #12665 : alexcrichton/rust/fix-snap-again, r=huonw

This should get us a passing snapshot again.

src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs

@@ -12,6 +12,7 @@
 // ignore-stage1
 // ignore-fast
 // ignore-android
+// ignore-cross-compile #12102
 
 #[feature(phase)];
 

src/test/run-pass-fulldeps/macro-crate.rs

@@ -12,6 +12,7 @@
 // ignore-stage1
 // ignore-fast
 // ignore-android
+// ignore-cross-compile #12102
 
 #[feature(phase)];