From 05045da9fdab511f39e88335b1bc7f92ea7973ba Mon Sep 17 00:00:00 2001
From: Cameron Hart <cameron.hart@gmail.com>
Date: Sat, 6 Aug 2016 15:54:28 +1000
Subject: Improved checking of target's llvm_config

Point llvm @bitshifter branch until PR accepted

Use today's date for LLVM auto clean trigger

Update LLVM submodule to point at rust-lang fork.

Handle case when target is set
---
 src/bootstrap/compile.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bootstrap/compile.rs')

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 9e1ee7ccd1e..155848901cd 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -199,7 +199,7 @@ pub fn rustc<'a>(build: &'a Build, target: &str, compiler: &Compiler<'a>) {
         cargo.env("CFG_DISABLE_UNSTABLE_FEATURES", "1");
     }
     // Flag that rust llvm is in use
-    if build.config.target_config.get(target).is_none() {
+    if build.is_rust_llvm(target) {
         cargo.env("LLVM_RUSTLLVM", "1");
     }
     cargo.env("LLVM_CONFIG", build.llvm_config(target));
-- 
cgit 1.4.1-3-g733a5