OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix various pathnames.

Browse Source
This commit is contained in:
Graydon Hoare 2011-03-21 13:42:29 -07:00
parent 5e0ef2a0f2
commit 65974396fa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.in
View File

@ -330,14 +330,14 @@ LLVMEXT_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS)
# Standard library variables # Standard library variables
###################################################################### ######################################################################
STDLIB_CRATE := lib/std.rc STDLIB_CRATE := $(S)src/lib/std.rc
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rc *.rs */*.rs)) STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rc *.rs */*.rs))
###################################################################### ######################################################################
# rustc crate variables # rustc crate variables
###################################################################### ######################################################################
COMPILER_CRATE := comp/rustc.rc COMPILER_CRATE := $(S)src/comp/rustc.rc
COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \ COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
rustc.rc *.rs */*.rs)) rustc.rc *.rs */*.rs))
@ -390,41 +390,41 @@ boot/version.ml: $(MKFILES)
boot/$(CFG_STDLIB): $(S)src/$(STDLIB_CRATE) $(STDLIB_INPUTS) \ boot/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
boot/rustboot$(X) $(MKFILES) boot/rustboot$(X) $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(BOOT) -shared -o $@ $< $(BOOT) -shared -o $@ $<
stage0/$(CFG_STDLIB): $(S)src/$(STDLIB_CRATE) $(STDLIB_INPUTS) \ stage0/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage0/rustc$(X) $(MKFILES) stage0/rustc$(X) $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE0) -shared -o $@ $< $(STAGE0) -shared -o $@ $<
stage1/$(CFG_STDLIB): $(S)src/$(STDLIB_CRATE) $(STDLIB_INPUTS) \ stage1/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage1/rustc$(X) $(MKFILES) stage1/rustc$(X) $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE1) -shared -o $@ $< $(STAGE1) -shared -o $@ $<
stage2/$(CFG_STDLIB): $(S)src/$(STDLIB_CRATE) $(STDLIB_INPUTS) \ stage2/$(CFG_STDLIB): $(STDLIB_CRATE) $(STDLIB_INPUTS) \
stage2/rustc$(X) $(MKFILES) stage2/rustc$(X) $(MKFILES)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE2) -shared -o $@ $< $(STAGE2) -shared -o $@ $<
stage0/rustc$(X): $(S)src/$(COMPILER_CRATE) $(COMPILER_INPUTS) \ stage0/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
$(BREQ) $(BREQ)
@$(call E, compile: $@) @$(call E, compile: $@)
$(BOOT) -minimal -o $@ $< $(BOOT) -minimal -o $@ $<
$(Q)chmod 0755 $@ $(Q)chmod 0755 $@
stage1/rustc$(X): $(S)src/$(COMPILER_CRATE) $(COMPILER_INPUTS) \ stage1/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
$(SREQ0) stage0/$(CFG_STDLIB) $(SREQ0) stage0/$(CFG_STDLIB)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE0) -o $@ $< $(STAGE0) -o $@ $<
$(Q)chmod 0755 $@ $(Q)chmod 0755 $@
stage2/rustc$(X): $(S)src/$(COMPILER_CRATE) $(COMPILER_INPUTS) \ stage2/rustc$(X): $(COMPILER_CRATE) $(COMPILER_INPUTS) \
$(SREQ1) stage1/$(CFG_STDLIB) $(SREQ1) stage1/$(CFG_STDLIB)
@$(call E, compile: $@) @$(call E, compile: $@)
$(STAGE1) -o $@ $< $(STAGE1) -o $@ $<
@ -873,7 +873,7 @@ compile-check: tidy \
%.out: %.out.tmp %.out: %.out.tmp
$(Q)mv $< $@ $(Q)mv $< $@
test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) rt/$(CFG_RUNTIME) test/run-pass/%.out.tmp: test/run-pass/%$(X) rt/$(CFG_RUNTIME)
$(Q)rm -f $<.tmp $(Q)rm -f $<.tmp
@$(call E, run: $@) @$(call E, run: $@)
$(Q)$(call T, $<) > $@ $(Q)$(call T, $<) > $@