user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #20317: brson/rust-installer-v2

Browse source
This commit is contained in:
Alex Crichton 2014-12-29 19:47:58 -08:00
commit cb7599b83e
5 changed files with 83 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/etc/make-win-dist.py
View file

@ -114,11 +114,5 @@ def make_win_dist(rust_root, gcc_root, target_triple):
for src in target_libs:
shutil.copy(src, target_lib_dir)
# Copy license files
lic_dir = os.path.join(rust_root, "bin", "third-party")
if os.path.exists(lic_dir):
shutil.rmtree(lic_dir) # copytree() won't overwrite existing files
shutil.copytree(os.path.join(os.path.dirname(__file__), "third-party"), lic_dir)
if __name__=="__main__":
make_win_dist(sys.argv[1], sys.argv[2], sys.argv[3])

2
src/rust-installer

@ -1 +1 @@
Subproject commit aed73472416064642911af790b25d57c9390b6c7
Subproject commit 3a37981744a5af2433fed551f742465c78c9af7f