Fix issue rust-lang#16 one last time.

Author: DiamondLovesYou

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,$$(subst lib,,$$(call CFG_LIB_NAME_$(3),LLVMgold))) \
+	      $$(call PREPARE_LIB,$$(LLVMgold_NAME_$(3))) \
 	      $$(call PREPARE_LIB,$$(call CFG_LIB_NAME_$(3),LTO)),),),),),)
 endef