aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2019-03-22 14:31:30 -0700
committerDan Albert <danalbert@google.com>2019-03-22 14:31:30 -0700
commit21e1f0478cba2044ee1994ef4c12a01d9975b6f4 (patch)
tree2cffc2eaa7ab45c6700c8d04a61ccda17b49d6d9
parent89fed6578607187830790c96d7310cf5fc635ffd (diff)
downloadyasm-21e1f0478cba2044ee1994ef4c12a01d9975b6f4.tar.gz
Adapt to ndk.hosts changes.
Test: ndk/checkbuild.py Bug: None Change-Id: I67baeb6cf6c15f08a8e5653aca95eec5382b1a31
-rwxr-xr-xbuild.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/build.py b/build.py
index b5ff7fae..8893c2e3 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):
@@ -31,14 +35,15 @@ def main(args):
build_support.ndk_path(),
]
- 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, 'yasm'))
build_support.build(build_cmd, args, intermediate_package=True)
+
if __name__ == '__main__':
build_support.run(main)