summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2019-03-22 14:30:43 -0700
committerDan Albert <danalbert@google.com>2019-03-22 14:30:43 -0700
commitb0e0a50234c91041ec73d7b74d97954ba66d0529 (patch)
tree3ac47f768d0c9e6aac531f23c0800be561f2d690
parent77b0e9cab98c258cfe49f8716966ce94c5d784d6 (diff)
downloadpython-b0e0a50234c91041ec73d7b74d97954ba66d0529.tar.gz
Adapt to ndk.hosts changes.
Test: ndk/checkbuild.py Bug: None Change-Id: I3a9e9c9f4e01a65e702f447cbb2cb3cac3a2d59f
-rwxr-xr-xbuild.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/build.py b/build.py
index d3e00f9..1a588ac 100755
--- a/build.py
+++ b/build.py
@@ -21,8 +21,12 @@ import os
import site
site.addsitedir(os.path.join(os.path.dirname(__file__), '../../ndk/build/lib'))
+site.addsitedir(os.path.join(os.path.dirname(__file__), '../../ndk'))
-import build_support # pylint: disable=import-error
+# pylint: disable=import-error,wrong-import-position
+import build_support
+from ndk.hosts import Host
+# pylint: enable=import-error,wrong-import-position
def main(args):
@@ -33,15 +37,16 @@ def main(args):
'bash', 'build-python.sh', toolchain_dir_arg,
]
- if args.host in ('windows', 'windows64'):
+ if args.host.is_windows:
build_cmd.append('--mingw')
- if args.host != 'windows':
+ if args.host != Host.Windows:
build_cmd.append('--try-64')
build_cmd.append('--build-dir=' + os.path.join(args.out_dir, 'python'))
build_support.build(build_cmd, args, intermediate_package=True)
+
if __name__ == '__main__':
build_support.run(main)