From 8692e64db9d862e48e8c1b0d4efc76aa256168f6 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Mon, 10 Oct 2016 16:18:18 -0500
Subject: [PATCH] add a rustbuild cargo feature for integration with
 rust-lang/rust

---
 library/compiler-builtins/build.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs
index 046085a9d07c..c0fdb52ec8a4 100644
--- a/library/compiler-builtins/build.rs
+++ b/library/compiler-builtins/build.rs
@@ -407,8 +407,15 @@ fn main() {
             sources.remove(&["aeabi_cdcmp", "aeabi_cfcmp"]);
         }
 
+        let root = if env::var_os("CARGO_FEATURE_RUSTBUILD").is_some() {
+            Path::new("../../libcompiler_builtins")
+        } else {
+            Path::new(".")
+        };
+
+        let src_dir = root.join("compiler-rt/compiler-rt-cdylib/compiler-rt/lib/builtins");
         for src in sources.map.values() {
-            let src = Path::new("compiler-rt/compiler-rt-cdylib/compiler-rt/lib/builtins").join(src);
+            let src = src_dir.join(src);
             cfg.file(&src);
             println!("cargo:rerun-if-changed={}", src.display());
         }