Skip to content

Commit 4bd8dcc

Browse files
committed
Try to fix the windows build.
1 parent e733311 commit 4bd8dcc

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,15 @@ rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
431431
rm -f $@
432432
ar crs $@ $^
433433

434+
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
435+
# it has no -whole-archive.
434436
rustllvm/$(CFG_RUSTLLVM): rustllvm/rustllvmbits.a $(RUSTLLVM_OBJS_OBJS) \
435437
$(MKFILES) $(RUSTLLVM_HDR) $(RUSTLLVM_DEF)
436438
@$(call E, link: $@)
437439
$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_OBJS_OBJS) \
438440
$(CFG_GCC_PRE_LIB_FLAGS) $(CFG_LLVM_LIBS) \
439441
$(CFG_GCC_POST_LIB_FLAGS) rustllvm/rustllvmbits.a \
442+
$(CFG_LLVM_LIBS) \
440443
$(CFG_LLVM_LDFLAGS),$(RUSTLLVM_DEF))
441444

442445
ifdef CFG_BOOT_NATIVE

0 commit comments

Comments
 (0)