diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-02 13:28:13 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-11-02 13:28:13 -0800 |
| commit | a7b64cc6059ce3bc6ee14ccd4761ced05b6ecf3a (patch) | |
| tree | a925f511b3ec12525a3b79853a766a2d10cf4dbb /checkbuild.py | |
| parent | 7270fa2548f60f921952e70129c8847bcbf06fe2 (diff) | |
| download | ndk-a7b64cc6059ce3bc6ee14ccd4761ced05b6ecf3a.tar.gz | |
Fix Windows gcclibs build.
When building for Windows the gcclibs module would fail because
libatomic isn't built for the Windows toolchain (no idea why). Since
this is purely a target module the host system is unimportant. Just
use the Linux prebuilt.
Change-Id: I34a368489c860c9299cab88133c9ebcfc2d8b389
Diffstat (limited to 'checkbuild.py')
| -rw-r--r-- | checkbuild.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/checkbuild.py b/checkbuild.py index 3f28162b0..702739fb6 100644 --- a/checkbuild.py +++ b/checkbuild.py @@ -326,7 +326,10 @@ def build_gcc_libs(out_dir, args): install_dir = os.path.join(tmpdir, 'prebuilt/gcclibs') os.makedirs(install_dir) - gcc_path = get_prebuilt_gcc(args.system, arch) + # These are target libraries, so the OS we use here is not + # important. We explicitly use Linux because for whatever reason + # the Windows aarch64 toolchain doesn't include libatomic. + gcc_path = get_prebuilt_gcc('linux', arch) for gcc_subdir, lib in libs: src = os.path.join(gcc_path, gcc_subdir, lib) dst = os.path.join(install_dir, triple, lib) |