about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-29 19:47:58 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-29 19:47:58 -0800
commitcb7599b83e8f072a8871db3fb238f50e067794de (patch)
tree0d4d7e4caf5b32dfe639a4109009b0189c27dcae /src
parent021c2f3712312d3170b1dbd27a3bd92360b541d3 (diff)
parentb12dfbb49124d6bae0fa6a4fdadde0bb1ba171cb (diff)
downloadrust-cb7599b83e8f072a8871db3fb238f50e067794de.tar.gz
rust-cb7599b83e8f072a8871db3fb238f50e067794de.zip
rollup merge of #20317: brson/rust-installer-v2
Diffstat (limited to 'src')
-rw-r--r--src/etc/make-win-dist.py6
m---------src/rust-installer0
2 files changed, 0 insertions, 6 deletions
diff --git a/src/etc/make-win-dist.py b/src/etc/make-win-dist.py
index 95e647c91cf..ea2a98db2dc 100644
--- a/src/etc/make-win-dist.py
+++ b/src/etc/make-win-dist.py
@@ -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])
diff --git a/src/rust-installer b/src/rust-installer
-Subproject aed73472416064642911af790b25d57c9390b6c
+Subproject 3a37981744a5af2433fed551f742465c78c9af7