Use correct machine cfg when preparing LLVMgold. Addresses issue rust-lang#16.

Author: DiamondLovesYou

Diff for: mk/llvm.mk

@@ -93,9 +93,8 @@ $$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(call CFG_LIB_NAME_$(2),LTO): $$(LLVM_CONFIG_$
 	$$(Q)cp $$(LLVM_LIBDIR_$(2))/$$(call CFG_LIB_NAME_$(2),LTO) $$@
 
 
-$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(shell echo $$(call CFG_LIB_NAME_$(2),LLVMgold) \
-                                         | sed 's/lib//'): $$(LLVM_CONFIG_$(2)) \
-	$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(call CFG_LIB_NAME_$(2),LTO)
+$$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(shell echo $$(call CFG_LIB_NAME_$(2),LLVMgold) | sed 's/lib//'): \
+	$$(LLVM_CONFIG_$(2)) $$(TROOT$(1)_T_$(2)_H_$(2))/lib/$$(call CFG_LIB_NAME_$(2),LTO)
 	$$(Q)cp $$(LLVM_LIBDIR_$(2))/$$(shell echo $$(call CFG_LIB_NAME_$(2),LLVMgold) \
 					      | sed 's/lib//') $$@
 endif

Diff for: mk/prepare.mk

@@ -155,7 +155,7 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
           $$(call PREPARE_LIB,libcompiler-rt.a) \
 	  $$(if $$(filter $(3),$(2)),\
 	    $$(if $$(findstring nacl,$$(PREPARE_TARGETS)),\
-	      $$(call PREPARE_LIB,$$(shell echo $$(call CFG_LIB_NAME_$(2),LLVMgold) | sed 's/lib//')) \
+	      $$(call PREPARE_LIB,$$(shell echo $$(call CFG_LIB_NAME_$(3),LLVMgold) | sed 's/lib//')) \
 	      $$(call PREPARE_LIB,$$(call CFG_LIB_NAME_$(3),LTO)),),),),),)
 endef