Skip to content

Commit d252539

Browse files
committed
mk: Rename CFG_COMPILER to CFG_COMPILER_HOST_TRIPLE
Much clearer
1 parent f772e31 commit d252539

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mk/target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# This is the compile-time target-triple for the compiler. For the compiler at
1212
# runtime, this should be considered the host-triple. More explanation for why
1313
# this exists can be found on issue #2400
14-
export CFG_COMPILER
14+
export CFG_COMPILER_HOST_TRIPLE
1515

1616
# The standard libraries should be held up to a higher standard than any old
1717
# code, make sure that these common warnings are denied by default. These can
@@ -68,7 +68,7 @@ $(foreach host,$(CFG_HOST), \
6868
# $(4) is the crate name
6969
define RUST_TARGET_STAGE_N
7070

71-
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER = $(2)
71+
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
7272
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7373
$$(CRATEFILE_$(4)) \
7474
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \

mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ else
350350
TESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4))
351351
endif
352352

353-
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER = $(2)
353+
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER_HOST_TRIPLE = $(2)
354354
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
355355
$$(CRATEFILE_$(4)) \
356356
$$(TESTDEP_$(1)_$(2)_$(3)_$(4))

src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ pub fn host_triple() -> ~str {
800800
// Instead of grabbing the host triple (for the current host), we grab (at
801801
// compile time) the target triple that this rustc is built with and
802802
// calling that (at runtime) the host triple.
803-
(env!("CFG_COMPILER")).to_owned()
803+
(env!("CFG_COMPILER_HOST_TRIPLE")).to_owned()
804804
}
805805

806806
pub fn build_session_options(matches: &getopts::Matches) -> session::Options {

0 commit comments

Comments
 (0)