From 4bd8dcccbc6437a29a684633ddca66508ad940a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Mon, 11 Apr 2011 15:05:18 -0400 Subject: Try to fix the windows build. --- Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.in b/Makefile.in index 1d04ea9c..ce61fed7 100644 --- a/Makefile.in +++ b/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 -- cgit v1.2.3