diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-03-25 19:23:45 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-03-25 21:35:10 -0700 |
| commit | d252539990f5b4abee412d08edc6b36fd2a6219e (patch) | |
| tree | dfdd2da676f8ba11475be01112fd763da4541442 | |
| parent | f772e31d6484f090b9bc50f8e14f426c9c6dfaff (diff) | |
| download | rust-d252539990f5b4abee412d08edc6b36fd2a6219e.tar.gz rust-d252539990f5b4abee412d08edc6b36fd2a6219e.zip | |
mk: Rename CFG_COMPILER to CFG_COMPILER_HOST_TRIPLE
Much clearer
| -rw-r--r-- | mk/target.mk | 4 | ||||
| -rw-r--r-- | mk/tests.mk | 2 | ||||
| -rw-r--r-- | src/librustc/driver/driver.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mk/target.mk b/mk/target.mk index 03569cb8b67..11c57ac070f 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -11,7 +11,7 @@ # This is the compile-time target-triple for the compiler. For the compiler at # runtime, this should be considered the host-triple. More explanation for why # this exists can be found on issue #2400 -export CFG_COMPILER +export CFG_COMPILER_HOST_TRIPLE # The standard libraries should be held up to a higher standard than any old # code, make sure that these common warnings are denied by default. These can @@ -68,7 +68,7 @@ $(foreach host,$(CFG_HOST), \ # $(4) is the crate name define RUST_TARGET_STAGE_N -$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER = $(2) +$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2) $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(CRATEFILE_$(4)) \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ diff --git a/mk/tests.mk b/mk/tests.mk index b0ae685faa8..7fd6d148f38 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -350,7 +350,7 @@ else TESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4)) endif -$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER = $(2) +$(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)) diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index fb0de959489..9ee0bb4a107 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -800,7 +800,7 @@ pub fn host_triple() -> ~str { // Instead of grabbing the host triple (for the current host), we grab (at // compile time) the target triple that this rustc is built with and // calling that (at runtime) the host triple. - (env!("CFG_COMPILER")).to_owned() + (env!("CFG_COMPILER_HOST_TRIPLE")).to_owned() } pub fn build_session_options(matches: &getopts::Matches) -> session::Options { |