From 2fd8044ceff8a42b09254ac7d5288e497d9b3778 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 2 Aug 2016 13:06:43 -0700
Subject: [PATCH] mk: Only pass -Zorbit=off in stage1/2

The stage0 compiler doesn't understand this option.
---
 mk/main.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/main.mk b/mk/main.mk
index 9a3a59ded35..c6c3e70abc3 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -164,7 +164,8 @@ endif
 
 ifdef CFG_DISABLE_ORBIT
   $(info cfg: HOLD HOLD HOLD (CFG_DISABLE_ORBIT))
-  CFG_RUSTC_FLAGS += -Z orbit=off
+  RUSTFLAGS_STAGE1 += -Z orbit=off
+  RUSTFLAGS_STAGE2 += -Z orbit=off
 endif
 
 ifdef SAVE_TEMPS