Permalink
Browse files

Merge pull request #39668 from alexcrichton/stable-next

[stable] More fixes for 1.15.1
  • Loading branch information...
2 parents d11639b + 5a35f02 commit 021bd294c039bd54aa5c4aa85bcdffb0d24bc892 @alexcrichton alexcrichton committed on GitHub Feb 9, 2017
Showing with 9 additions and 2 deletions.
  1. +4 −2 RELEASES.md
  2. +5 −0 src/bootstrap/lib.rs
View
@@ -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]
@@ -812,6 +812,11 @@ impl Build {
},
_ => {},
}
+
+ if !target.contains("windows") && target.contains("i686") {
+ base.push("-fPIC".into());
+ }
+
return base
}

0 comments on commit 021bd29

Please sign in to comment.