diff options
| author | Rafael Ávila de Espíndola <[email protected]> | 2011-04-11 15:05:18 -0400 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <[email protected]> | 2011-04-11 15:05:18 -0400 |
| commit | 4bd8dcccbc6437a29a684633ddca66508ad940a3 (patch) | |
| tree | fde396dc779e389493280cacab010b1b0bfc4ee8 /Makefile.in | |
| parent | Make sure RustWrapper.cpp is linked in. (diff) | |
| download | rust-4bd8dcccbc6437a29a684633ddca66508ad940a3.tar.xz rust-4bd8dcccbc6437a29a684633ddca66508ad940a3.zip | |
Try to fix the windows build.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
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 |