diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-05-20 22:14:38 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-05-21 11:01:59 -0700 |
| commit | 7c8c5447319a13d10ce7d07dd1da93e17744a13c (patch) | |
| tree | 738899cc0048df1864d24a47d475c66deccbac4d | |
| parent | 44fcf46b00389bea30f4902ce77f2e33557d9170 (diff) | |
| download | rust-7c8c5447319a13d10ce7d07dd1da93e17744a13c.tar.gz rust-7c8c5447319a13d10ce7d07dd1da93e17744a13c.zip | |
mk: Replace 'oxidize' with 'rustc'. Closes #13781
| -rw-r--r-- | mk/target.mk | 4 | ||||
| -rw-r--r-- | mk/tests.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mk/target.mk b/mk/target.mk index 448299965a8..f29a7a1348e 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, oxidize: $$(@D)/lib$(4)) + @$$(call E, rustc: $$(@D)/lib$(4)) $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4))) $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ @@ -114,7 +114,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, oxidize: $$@) + @$$(call E, rustc: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4) endef diff --git a/mk/tests.mk b/mk/tests.mk index 25f03751074..c67fa0042f8 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -372,7 +372,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER_HOST_TRIPLE = $(2) $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ $$(CRATEFILE_$(4)) \ $$(TESTDEP_$(1)_$(2)_$(3)_$(4)) - @$$(call E, oxidize: $$@) + @$$(call E, rustc: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ -L "$$(RT_OUTPUT_DIR_$(2))" \ -L "$$(LLVM_LIBDIR_$(2))" |