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

Remove the redundant definition of STAGE in makefiles

This commit is contained in:
Brian Anderson 2011-09-29 12:06:37 -07:00
parent 4ee9b86384
commit 7dbce103fb
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.in
View File

@ -197,8 +197,13 @@ CFG_VALGRIND_COMPILE$(1) = $$(CFG_VALGRIND_COMPILE)
endif endif
STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \ STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
$$(CFG_VALGRIND_COMPILE$(1)) stage$(1)/bin/rustc$$(X) \ $$(CFG_VALGRIND_COMPILE) stage$(1)/bin/rustc$$(X) \
$$(CFG_RUSTC_FLAGS)) $$(CFG_RUSTC_FLAGS) --target=$(2))
PERF_STAGE$(1) := $$(Q)$$(call CFG_RUN_TARG,stage$(1), \
$$(CFG_PERF_TOOL) stage$(1)/bin/rustc$$(X) \
$$(CFG_RUSTC_FLAGS) --target=$(2))
endef endef
FUZZ := stage1/bin/fuzzer$(X) FUZZ := stage1/bin/fuzzer$(X)

8
mk/stageN.mk
View File

@ -19,14 +19,6 @@ define STAGE_N
# for different directories, to handle cases where (say) a test relies on a # for different directories, to handle cases where (say) a test relies on a
# compiler that relies on a .o file. # compiler that relies on a .o file.
STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
$$(CFG_VALGRIND_COMPILE) stage$(2)/bin/rustc$$(X) \
$$(CFG_RUSTC_FLAGS) --target=$(3))
PERF_STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
$$(CFG_PERF_TOOL) stage$(2)/bin/rustc$$(X) \
$$(CFG_RUSTC_FLAGS) --target=$(3))
stage$(2)/bin/%.o: stage$(2)/bin/%.s stage$(2)/bin/%.o: stage$(2)/bin/%.s
@$$(call E, assemble [gcc]: $$@) @$$(call E, assemble [gcc]: $$@)
$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$< $$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<