Install and snapshot cargo by default.

diff --git a/mk/install.mk b/mk/install.mk
index 7d89f82c0198cf1cd50d713fc901717234ce5815..8f277f2301ae330c326cecca9c4a09cddf4cdb54 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -68,6 +68,7 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
        $(Q)mkdir -p $(PREFIX_LIB)
        $(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
        $(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X))
+       $(Q)$(call INSTALL,$(HB),$(PHB),cargo$(X))
        $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
        $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
        $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))

diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index 130304fdab8321ed178f34ec55ff37f732b12f93..5b7985788e0e678c82ea11f5ffca6670b46a8ae3 100644 (file)
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -17,18 +17,21 @@ download_unpack_base = os.path.join(download_dir_base, "unpack")
 
 snapshot_files = {
     "linux": ["bin/rustc",
+              "bin/cargo",
               "lib/libcore-*.so",
               "lib/libstd-*.so",
               "lib/librustc-*.so",
               "lib/librustrt.so",
               "lib/librustllvm.so"],
     "macos": ["bin/rustc",
+              "bin/cargo",
               "lib/libcore-*.dylib",
               "lib/libstd-*.dylib",
               "lib/librustc-*.dylib",
               "lib/librustrt.dylib",
               "lib/librustllvm.dylib"],
     "winnt": ["bin/rustc.exe",
+              "bin/cargo.exe",
               "lib/core-*.dll",
               "lib/std-*.dll",
               "lib/rustc-*.dll",