diff options
| author | bors <bors@rust-lang.org> | 2014-02-09 16:16:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-09 16:16:33 -0800 |
| commit | 35b4115ef8dc4d78559c492d7251235c17cdb4e7 (patch) | |
| tree | c26061ef999604e20c961b42287e599c4d2529c2 | |
| parent | 27f9c7951fb30b299341668f16a6f84169e1379e (diff) | |
| parent | 3062d0f6bba35c735684d622b1354146174ac020 (diff) | |
| download | rust-35b4115ef8dc4d78559c492d7251235c17cdb4e7.tar.gz rust-35b4115ef8dc4d78559c492d7251235c17cdb4e7.zip | |
auto merge of #12126 : brson/rust/oxidize_mk, r=alexcrichton
I've always thought 'compile_and_link: ...' looked really awkward in our build output. Replace it with something more interesting. I'm open to alternatives to 'oxidize', like 'compile', anything but 'compile_and_link'.
| -rw-r--r-- | mk/target.mk | 4 | ||||
| -rw-r--r-- | mk/tests.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/target.mk b/mk/target.mk index c4bd082b3a2..461e09da625 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -74,7 +74,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \ | $$(TLIB$(1)_T_$(2)_H_$(3))/ - @$$(call E, compile_and_link: $$(@D)/lib$(4)) + @$$(call E, oxidize: $$(@D)/lib$(4)) $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4))) $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ @@ -113,7 +113,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \ | $$(TBIN$(1)_T_$(4)_H_$(3))/ - @$$(call E, compile_and_link: $$@) + @$$(call E, oxidize: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4) endef diff --git a/mk/tests.mk b/mk/tests.mk index d2fccbd47cf..11d1c401d63 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -347,7 +347,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ $$(CRATEFILE_$(4)) \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ $$(STDTESTDEP_$(1)_$(2)_$(3)_$(4)) - @$$(call E, compile_and_link: $$@) + @$$(call E, oxidize: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ -L "$$(RT_OUTPUT_DIR_$(2))" \ -L "$$(LLVM_LIBDIR_$(2))" @@ -835,7 +835,7 @@ define DEF_CHECK_FAST_FOR_T_H $$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \ tmp/$$(FT).rc \ $$(SREQ2_T_$(2)_H_$(3)) - @$$(call E, compile_and_link: $$@) + @$$(call E, oxidize: $$@) $$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \ -L "$$(RT_OUTPUT_DIR_$(2))" @@ -843,7 +843,7 @@ $(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \ tmp/$$(FT_DRIVER).rs \ $$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \ $$(SREQ2_T_$(2)_H_$(3)) - @$$(call E, compile_and_link: $$@ $$<) + @$$(call E, oxidize: $$@ $$<) $$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \ -L "$$(RT_OUTPUT_DIR_$(2))" |