From d882e201f4ebd400dabfad32dcebbd48074b69c2 Mon Sep 17 00:00:00 2001
From: William Throwe <wtt6@cornell.edu>
Date: Tue, 8 Sep 2015 13:03:23 -0400
Subject: [PATCH] Don't force system LLVM libs to be linked staticly

---
 mk/llvm.mk          | 2 +-
 src/etc/mklldeps.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/llvm.mk b/mk/llvm.mk
index d5b608e88daf8..ddeb7a49274aa 100644
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -83,7 +83,7 @@ endif
 LLVM_LINKAGE_PATH_$(1):=$$(abspath $$(RT_OUTPUT_DIR_$(1))/llvmdeps.rs)
 $$(LLVM_LINKAGE_PATH_$(1)): $(S)src/etc/mklldeps.py $$(LLVM_CONFIG_$(1))
 	$(Q)$(CFG_PYTHON) "$$<" "$$@" "$$(LLVM_COMPONENTS)" "$$(CFG_ENABLE_LLVM_STATIC_STDCPP)" \
-		$$(LLVM_CONFIG_$(1))
+		"$$(CFG_LLVM_ROOT)" $$(LLVM_CONFIG_$(1))
 endef
 
 $(foreach host,$(CFG_HOST), \
diff --git a/src/etc/mklldeps.py b/src/etc/mklldeps.py
index 1cc65406b2c00..fb62572453ba4 100644
--- a/src/etc/mklldeps.py
+++ b/src/etc/mklldeps.py
@@ -16,7 +16,8 @@
 
 components = sys.argv[2].split() # splits on whitespace
 enable_static = sys.argv[3]
-llvm_config = sys.argv[4]
+llvm_root = sys.argv[4]
+llvm_config = sys.argv[5]
 
 f.write("""// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
@@ -63,7 +64,7 @@ def run(args):
         lib = lib.strip()[1:]
     f.write("#[link(name = \"" + lib + "\"")
     # LLVM libraries are all static libraries
-    if 'LLVM' in lib:
+    if llvm_root == '' and 'LLVM' in lib:
         f.write(", kind = \"static\"")
     f.write(")]\n")