diff options
| author | bors <bors@rust-lang.org> | 2016-08-02 13:10:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 13:10:27 -0700 |
| commit | a005b6785935d7e92e87774c8f585839ddd12e46 (patch) | |
| tree | 6ad44e76e141e00b66bfe95ead87bf18c7e589dd | |
| parent | 32e462ef99e2f61b75e2b0ef37048d50ad8ccf6c (diff) | |
| parent | 2fd8044ceff8a42b09254ac7d5288e497d9b3778 (diff) | |
| download | rust-a005b6785935d7e92e87774c8f585839ddd12e46.tar.gz rust-a005b6785935d7e92e87774c8f585839ddd12e46.zip | |
Auto merge of #35187 - alexcrichton:only-orbit-off-stage1-and-two, r=eddyb
mk: Only pass -Zorbit=off in stage1/2 The stage0 compiler doesn't understand this option.
| -rw-r--r-- | mk/main.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 |