diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-02-08 17:06:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 17:06:53 -0800 |
| commit | 021bd294c039bd54aa5c4aa85bcdffb0d24bc892 (patch) | |
| tree | 102579d8bcd7b7acc7428c4aa43752caf1f23d2b | |
| parent | d11639bdac67e850235b04dc7ac679d9e378b813 (diff) | |
| parent | 5a35f0273606e7172be30ac0f013be6c12f926c5 (diff) | |
| download | rust-021bd294c039bd54aa5c4aa85bcdffb0d24bc892.tar.gz rust-021bd294c039bd54aa5c4aa85bcdffb0d24bc892.zip | |
Merge pull request #39668 from alexcrichton/stable-next 1.15.1
[stable] More fixes for 1.15.1
| -rw-r--r-- | RELEASES.md | 6 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/RELEASES.md b/RELEASES.md index 7a543c7f726..bf67ddfbbee 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,9 +1,11 @@ -Version 1.15.1 (2017-02-08) +Version 1.15.1 (2017-02-09) =========================== * [Fix IntoIter::as_mut_slice's signature][39466] +* [Compile compiler builtins with `-fPIC` on 32-bit platforms][39523] [39466]: https://github.com/rust-lang/rust/pull/39466 +[39523]: https://github.com/rust-lang/rust/pull/39523 Version 1.15.0 (2017-02-02) @@ -971,7 +973,7 @@ Tooling * [Test binaries now support a `--test-threads` argument to specify the number of threads used to run tests, and which acts the same as the `RUST_TEST_THREADS` environment variable] - (https://github.com/rust-lang/rust/pull/35414) + (https://github.com/rust-lang/rust/pull/35414) * [The test runner now emits a warning when tests run over 60 seconds] (https://github.com/rust-lang/rust/pull/35405) * [rustdoc: Fix methods in search results] diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index cd80c4298dc..71cb2895736 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -812,6 +812,11 @@ impl Build { }, _ => {}, } + + if !target.contains("windows") && target.contains("i686") { + base.push("-fPIC".into()); + } + return base } |