diff options
author | Dan Albert <danalbert@google.com> | 2015-08-25 21:36:01 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2015-08-27 14:41:39 -0700 |
commit | 0dd23076772c8f9785672977b90c6220a22bae96 (patch) | |
tree | 119ac21d9ba9aa5f8dd2e93fd89501496fe2f993 /build.py | |
parent | dc03ff1e85fb2d7a8100953d352c58c41a4147cf (diff) | |
download | toolchain_gcc-0dd23076772c8f9785672977b90c6220a22bae96.tar.gz toolchain_gcc-0dd23076772c8f9785672977b90c6220a22bae96.tar.bz2 toolchain_gcc-0dd23076772c8f9785672977b90c6220a22bae96.zip |
Fix 32-bit Windows build.
Oops. Accidentally applied --try-64 to win32.
For some reason the order of the mingw and try-64 flag seems to affect
the argument parsing :(
Change-Id: Ie993be9bc9a0a2e3fc5838767276da566100fbf6
(cherry picked from commit d04816184a047fc46234a2c763aeea436f9bcc04)
Diffstat (limited to 'build.py')
-rwxr-xr-x | build.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -95,7 +95,7 @@ def main(): try_64_arg = '--try-64' if host == 'windows': - try_64_arg = '--try-64' + try_64_arg = '' ndk_build_tools_path = android_path('prebuilts/ndk/current/build/tools') build_env = dict(os.environ) @@ -107,7 +107,7 @@ def main(): toolchain_name = '-'.join([toolchain, GCC_VERSION]) build_cmd = [ 'bash', 'build-gcc.sh', toolchain_path, ndk_path, toolchain_name, - package_dir_arg, '--verbose', try_64_arg, mingw_arg, jobs_arg, + package_dir_arg, '--verbose', mingw_arg, try_64_arg, jobs_arg, ] subprocess.check_call(build_cmd, env=build_env) |