diff options
| author | bors <bors@rust-lang.org> | 2014-02-11 05:56:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-11 05:56:43 -0800 |
| commit | 5b5ebf230b02e430e087b3f2edaaf1cfe5567b34 (patch) | |
| tree | 984d7af45c969a37ef8fd8cf0336d1c543a3c93c | |
| parent | 9e133d113ba45e146d091c699f5235052f798012 (diff) | |
| parent | 47ece1fa2ceec10f171fe87f789191999e914675 (diff) | |
| download | rust-5b5ebf230b02e430e087b3f2edaaf1cfe5567b34.tar.gz rust-5b5ebf230b02e430e087b3f2edaaf1cfe5567b34.zip | |
auto merge of #12177 : alexcrichton/rust/fix-snapshot, r=kballard
This is blocking a snapshot because the stage0 target compiler comes from a stage1 host compiler. This means that the stage0 compiler doesn't actually understand the -Z prefer-dynamic flag and is dying as a result. This will get added back to stage0 after a snapshot.
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 2d4c5e858a7..d0a7c5402e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -140,7 +140,8 @@ endif # snapshot will be generated with a statically linked rustc so we only have to # worry about the distribution of one file (with its native dynamic # dependencies) -RUSTFLAGS_STAGE0 += -Z prefer-dynamic +# +# NOTE: after a snapshot (stage0), put this on stage0 as well RUSTFLAGS_STAGE1 += -C prefer-dynamic # platform-specific auto-configuration |