about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-12-11 18:05:05 -0800
committerBrian Anderson <banderson@mozilla.com>2014-12-29 17:26:02 -0800
commit4f2ab2bf4663034fcd0395afd274a9b3a4681776 (patch)
tree674eaaeb07bc570a83f8be9f05635c012b39049b
parent3dcc409fac18a258ba2a8af4345d9566ec8eebad (diff)
Upgrade rust-installer to v2
-rw-r--r--mk/dist.mk4
-rw-r--r--mk/tests.mk1
m---------src/rust-installer0
3 files changed, 4 insertions, 1 deletions
diff --git a/mk/dist.mk b/mk/dist.mk
index bdda15dcc18..6a019ab9d03 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -242,7 +242,9 @@ dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
 		--work-dir=tmp/dist \
 		--output-dir=dist \
 		--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
-		--package-name=$$(PKG_NAME)-$(1)
+		--package-name=$$(PKG_NAME)-$(1) \
+		--component-name=rustc \
+		--legacy-manifest-dirs=rustlib,cargo
 	$$(Q)rm -R tmp/dist/$$(PKG_NAME)-$(1)-image
 
 endef
diff --git a/mk/tests.mk b/mk/tests.mk
index 1a122572e43..17fb159c7fc 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -297,6 +297,7 @@ tidy:
 		| grep '^$(S)src/doc' -v \
 		| grep '^$(S)src/compiler-rt' -v \
 		| grep '^$(S)src/libbacktrace' -v \
+		| grep '^$(S)src/rust-installer' -v \
 		| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
 
 endif
diff --git a/src/rust-installer b/src/rust-installer
-Subproject aed73472416064642911af790b25d57c9390b6c
+Subproject 3a37981744a5af2433fed551f742465c78c9af7