Fixes rust-lang#16, again.

TimNN · Apr 12, 2015 · 146d5c0 · 146d5c0
1 parent ff0529c
commit 146d5c0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mk/llvm.mk b/mk/llvm.mk
@@ -91,9 +91,12 @@ $$(TROOT$(1)_T_$(2)_H_$(2))/lib/LLVMgold.dll: $$(LLVM_CONFIG_$(2)) \
 else
 $$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(call CFG_LIB_NAME_$(2),LTO): $$(LLVM_CONFIG_$(2))
 	$$(Q)cp $$(LLVM_LIBDIR_$(2))/$$(call CFG_LIB_NAME_$(2),LTO) $$@
-$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(subst lib,,$$(call CFG_LIB_NAME_$(2),LLVMgold)): $$(LLVM_CONFIG_$(2)) \
+
+LLVMgold_NAME_$(2) := $$(shell echo $$(call CFG_LIB_NAME_$(2),LLVMgold) | sed 's/lib//')
+
+$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(LLVMgold_NAME_$(2)): $$(LLVM_CONFIG_$(2)) \
 	$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(call CFG_LIB_NAME_$(2),LTO)
-	$$(Q)cp $$(LLVM_LIBDIR_$(2))/$$(subst lib,,$$(call CFG_LIB_NAME_$(2),LLVMgold)) $$@
+	$$(Q)cp $$(LLVM_LIBDIR_$(2))/$$(LLVMgold_NAME_$(2)) $$@
 endif
 
 endef