---

yaml
---
r: 2057
b: refs/heads/master
c: 4bd8dcc
h: refs/heads/master
i:
  2055: 19dc016
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e733311a95fcde5d4d41210577d22f08a5f07f1a
+refs/heads/master: 4bd8dcccbc6437a29a684633ddca66508ad940a3

trunk/Makefile.in

@@ -431,12 +431,15 @@ rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
 	rm -f $@
 	ar crs $@ $^
 
+# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
+# it has no -whole-archive.
 rustllvm/$(CFG_RUSTLLVM): rustllvm/rustllvmbits.a $(RUSTLLVM_OBJS_OBJS) \
                           $(MKFILES) $(RUSTLLVM_HDR) $(RUSTLLVM_DEF)
 	@$(call E, link: $@)
 	$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_OBJS_OBJS) \
 	  $(CFG_GCC_PRE_LIB_FLAGS) $(CFG_LLVM_LIBS) \
           $(CFG_GCC_POST_LIB_FLAGS) rustllvm/rustllvmbits.a \
+	  $(CFG_LLVM_LIBS) \
           $(CFG_LLVM_LDFLAGS),$(RUSTLLVM_DEF))
 
 ifdef CFG_BOOT_NATIVE