From 6c1d8c524fa54e4c821459e8a64e715290470e41 Mon Sep 17 00:00:00 2001 From: Ben Striegel Date: Fri, 8 Jun 2012 20:09:59 -0400 Subject: [PATCH 1/2] cfg: shell host triple x86_64-unknown-linux-gnu cfg: host for x86_64-unknown-linux-gnu is x86_64 cfg: unix-y environment cfg: using gcc cfg: no pdflatex found, omitting doc/rust.pdf cfg: no llnextgen found, omitting grammar-verification cfg: including install rules install: /usr/local/bin/rustc fix to address #2555 --- mk/install.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/install.mk b/mk/install.mk index af84c7023ab35..c536996b2c11d 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -58,7 +58,7 @@ install: all install-host install-targets # Shorthand for build/stageN/bin HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) -HB3 = $(HBIN3_H_$(CFG_HOST_TRIPLE)) +HB3 = $(HBIN2_H_$(CFG_HOST_TRIPLE)) # Shorthand for build/stageN/lib HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) # Shorthand for the prefix bin directory From 75eb02f40ef38d7844317e92d2ebc8e0abb1120e Mon Sep 17 00:00:00 2001 From: Ben Striegel Date: Fri, 8 Jun 2012 20:18:16 -0400 Subject: [PATCH 2/2] Rename some misleading variables --- mk/install.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/install.mk b/mk/install.mk index c536996b2c11d..029fa30e7b8ff 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -58,7 +58,7 @@ install: all install-host install-targets # Shorthand for build/stageN/bin HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) -HB3 = $(HBIN2_H_$(CFG_HOST_TRIPLE)) +HB2 = $(HBIN2_H_$(CFG_HOST_TRIPLE)) # Shorthand for build/stageN/lib HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE)) # Shorthand for the prefix bin directory @@ -70,9 +70,9 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) $(Q)mkdir -p $(PREFIX_BIN) $(Q)mkdir -p $(PREFIX_LIB) $(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1 - $(Q)$(call INSTALL,$(HB3),$(PHB),rustc$(X)) - $(Q)$(call INSTALL,$(HB3),$(PHB),cargo$(X)) - $(Q)$(call INSTALL,$(HB3),$(PHB),rustdoc$(X)) + $(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X)) + $(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X)) + $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB)) $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))