diff options
| author | Dan Albert <danalbert@google.com> | 2015-10-15 19:12:54 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-10-16 10:19:52 -0700 |
| commit | ecf2e59536a5ee87e23e153d558bade34b652602 (patch) | |
| tree | deef7c3f330228bd3a9986224c27ee18de6a964c /checkbuild.py | |
| parent | 91961bdd0c84ebcf5272753335f766df216b3021 (diff) | |
| download | ndk-ecf2e59536a5ee87e23e153d558bade34b652602.tar.gz | |
Simplify binutils package name.
Bug: http://b/24990121
Change-Id: I93e4fd75634fa92b389240615bee737f2ed1d3dd
Diffstat (limited to 'checkbuild.py')
| -rw-r--r-- | checkbuild.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/checkbuild.py b/checkbuild.py index 878e57f17..89d0bbe53 100644 --- a/checkbuild.py +++ b/checkbuild.py @@ -224,8 +224,8 @@ def _install_file(src_file, dst_file): shutil.copy2(src_file, dst_file) -def pack_binutils(toolchain, host_tag, out_dir, root_dir, binutils_path): - archive_name = '-'.join(['binutils', toolchain, host_tag]) +def pack_binutils(arch, host_tag, out_dir, root_dir, binutils_path): + archive_name = '-'.join(['binutils', arch, host_tag]) archive_path = os.path.join(out_dir, archive_name) base_dir = os.path.relpath(binutils_path, root_dir) shutil.make_archive(archive_path, 'bztar', root_dir=root_dir, @@ -264,7 +264,7 @@ def build_binutils(out_dir, args): has_gold = not triple.startswith('mips') and not is_windows for file_name in get_binutils_files(triple, has_gold, is_windows): install_file(file_name, toolchain_path, install_dir) - pack_binutils(toolchain, host_tag, out_dir, tmpdir, install_dir) + pack_binutils(arch, host_tag, out_dir, tmpdir, install_dir) finally: shutil.rmtree(tmpdir) |