Skip to content

Commit

Permalink
Auto merge of #78 - mmatyas:arm_build2, r=metajack
Browse files Browse the repository at this point in the history
Disable initial values set by `make`.

This fixes cross compilation issues, so it now builds correctly for both Android and ARM.
(See servo/servo#6537)

Part of servo/servo#6327.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-stb-image/78)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Aug 4, 2015
2 parents 2235148 + 6945b99 commit ddb1223
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.rs
Expand Up @@ -8,7 +8,7 @@ use std::process::{Command, Stdio};
fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let result = Command::new("make")
.args(&["-f", "makefile.cargo"])
.args(&["-R", "-f", "makefile.cargo"])
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.status()
Expand Down

0 comments on commit ddb1223

Please sign in to comment.