commit 6f40a53b210eb1743939972b8a7dbdccb606f1f3
author Dan Albert <danalbert@google.com> Fri Sep 20 14:47:50 2019 -0700
committer Dan Albert <danalbert@google.com> Fri Sep 20 14:47:50 2019 -0700
tree 396f3f94bfe3069ebae259c0d3d2817f8bf11c05
parent bd24d23f081feb4eb1438c56ace4ae91778ae6be

Fix bug for copying winpthread on Windows.

This was broken when I changed this API. ld can't be run from the
arch-specific bin directory because this is missing.

Test: Build, check that winpthread is copied
Bug: None
Change-Id: Ia01e88624b0e66edc5563c931bdfbea174d2a131

do_build.py

diff --git a/do_build.py b/do_build.py
index 96033ec..7c58bd4 100755
--- a/do_build.py
+++ b/do_build.py
@@ -165,7 +165,7 @@
     """Installs binutils."""
     check_call(['make', 'install-strip', '-j', str(jobs)])
 
-    if host in ('win', 'win64'):
+    if host.is_windows:
         arch_install_dir = os.path.join(
             install_dir, ndk.abis.arch_to_triple(arch))
         install_winpthreads(host == 'win', install_dir)