From 85f75ff261e0541199b4d05e3be4b21d245e781b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Thu, 2 Jul 2015 12:54:36 +0200 Subject: [PATCH 1/2] Allow to override CC and AR for cross compilation. --- makefile.cargo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile.cargo b/makefile.cargo index 21c10fd8b..f2c74521f 100644 --- a/makefile.cargo +++ b/makefile.cargo @@ -1,7 +1,7 @@ ifeq (eabi,$(findstring eabi,$(TARGET))) -CXX := $(TARGET)-g++ -AR := $(TARGET)-ar +CXX ?= $(TARGET)-g++ +AR ?= $(TARGET)-ar else From 989ee38eedc80ccb09f718c84f9bad229f421e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Tue, 28 Jul 2015 14:12:36 +0200 Subject: [PATCH 2/2] Disable initial values set by `make`. --- build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.rs b/build.rs index a00752974..b23a7d3c0 100644 --- a/build.rs +++ b/build.rs @@ -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()