Skip to content

Commit

Permalink
Revert 9ab4203 while I find what is
Browse files Browse the repository at this point in the history
wrong on Windows.
  • Loading branch information
cixtor committed Apr 18, 2011
1 parent 8a6590a commit 9657e5d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 25 deletions.
54 changes: 30 additions & 24 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -463,27 +463,27 @@ boot/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
@$(call E, compile: $@)
$(BOOT) -shared -o $@ $<

stage0/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage0/rustc$(X) $(MKFILES)
stage0/std.s: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage0/rustc$(X) $(MKFILES)
@$(call E, compile: $@)
$(STAGE0) -c -shared -o $@ $<
$(STAGE0) -S -shared -o $@ $<

stage0/$(CFG_STDLIB): stage0/std.o stage0/glue.o
@$(call E, link: $@)
$(Q)gcc $(CFG_GCC_CFLAGS) stage0/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
-Lstage0 -Lrt -lrustrt

stage1/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage1/rustc$(X) $(MKFILES)
stage1/std.s: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage1/rustc$(X) $(MKFILES)
@$(call E, compile: $@)
$(STAGE1) -c -shared -o $@ $<
$(STAGE1) -S -shared -o $@ $<

stage1/$(CFG_STDLIB): stage1/std.o stage1/glue.o
@$(call E, link: $@)
$(Q)gcc $(CFG_GCC_CFLAGS) stage1/glue.o $(CFG_GCC_LINK_FLAGS) -o $@ $< \
-Lstage1 -Lrt -lrustrt

stage2/std.o: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage2/rustc$(X) $(MKFILES)
stage2/std.s: $(STDLIB_CRATE) $(STDLIB_INPUTS) stage2/rustc$(X) $(MKFILES)
@$(call E, compile: $@)
$(STAGE2) -c -shared -o $@ $<
$(STAGE2) -S -shared -o $@ $<

stage2/$(CFG_STDLIB): stage2/std.o stage2/glue.o
@$(call E, link: $@)
Expand All @@ -509,20 +509,20 @@ stage2/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)



stage0/glue.o: stage0/rustc$(X) boot/$(CFG_STDLIB) \
stage0/glue.s: stage0/rustc$(X) boot/$(CFG_STDLIB) \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@)
$(STAGE0) -c -o $@ -glue
$(STAGE0) -S -o $@ -glue

stage1/glue.o: stage1/rustc$(X) stage0/$(CFG_STDLIB) \
stage1/glue.s: stage1/rustc$(X) stage0/$(CFG_STDLIB) \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@)
$(STAGE1) -c -o $@ -glue
$(STAGE1) -S -o $@ -glue

stage2/glue.o: stage2/rustc$(X) stage1/$(CFG_STDLIB) \
stage2/glue.s: stage2/rustc$(X) stage1/$(CFG_STDLIB) \
rustllvm/$(CFG_RUSTLLVM) rt/$(CFG_RUNTIME)
@$(call E, generate: $@)
$(STAGE2) -c -o $@ -glue
$(STAGE2) -S -o $@ -glue

# Due to make not wanting to run the same implicit rules twice on the same
# rule tree (implicit-rule recursion prevention, see "Chains of Implicit
Expand Down Expand Up @@ -789,29 +789,35 @@ compile-check: tidy \
@$(call E, compile [boot]: $@)
$(BOOT) -o $@ $<

%.stage0.o: %.rc $(SREQ0)
%.stage0.s: %.rc $(SREQ0)
@$(call E, compile [stage0]: $@)
$(STAGE0) -c -o $@ $<
$(STAGE0) -S -o $@ $<

%.stage0.o: %.rs $(SREQ0)
%.stage0.s: %.rs $(SREQ0)
@$(call E, compile [stage0]: $@)
$(STAGE0) -c -o $@ $<
$(STAGE0) -S -o $@ $<

%.stage1.o: %.rc $(SREQ1)
%.stage1.s: %.rc $(SREQ1)
@$(call E, compile [stage1]: $@)
$(STAGE1) -c -o $@ $<
$(STAGE1) -S -o $@ $<

%.stage1.o: %.rs $(SREQ1)
%.stage1.s: %.rs $(SREQ1)
@$(call E, compile [stage1]: $@)
$(STAGE1) -c -o $@ $<
$(STAGE1) -S -o $@ $<

%.stage2.o: %.rc $(SREQ2)
%.stage2.s: %.rc $(SREQ2)
@$(call E, compile [stage2]: $@)
$(STAGE2) -c -o $@ $<
$(STAGE2) -S -o $@ $<

%.stage2.o: %.rs $(SREQ2)
%.stage2.s: %.rs $(SREQ2)
@$(call E, compile [stage2]: $@)
$(STAGE2) -c -o $@ $<
$(STAGE2) -S -o $@ $<



%.o: %.s
@$(call E, assemble [llvm]: $@)
$(Q)gcc $(CFG_GCC_CFLAGS) -o $@ -c $<

# Cancel the implicit .out rule in GNU make.
%.out: %
Expand Down
1 change: 0 additions & 1 deletion src/rustllvm/RustWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, LLVMModuleRef M,
LLVMCodeGenFileType FileType) {
InitializeAllTargets();
InitializeAllAsmPrinters();
InitializeAllAsmParsers();
TargetMachine::setRelocationModel(Reloc::PIC_);
std::string Err;
const Target *TheTarget = TargetRegistry::lookupTarget(triple, Err);
Expand Down

0 comments on commit 9657e5d

Please sign in to comment.