diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-12-16 19:36:02 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-12-16 19:37:27 -0800 |
| commit | c758e11fd37f54ddfa9a628466fde7c92c027947 (patch) | |
| tree | 6db92f71a15c51ef940cf25f6e84d340e9802fe0 | |
| parent | b5b2ac0ec4fea9e71ca646a96e0c025e83bfa56e (diff) | |
Install and snapshot cargo by default.
| -rw-r--r-- | mk/install.mk | 1 | ||||
| -rw-r--r-- | src/etc/snapshot.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mk/install.mk b/mk/install.mk index 7d89f82c019..8f277f2301a 100644 --- 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 130304fdab8..5b7985788e0 100644 --- 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", |