diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-04-04 14:16:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-04 20:16:48 +0000 |
| commit | cab7d0c118005221691f745df78dc46168e682e1 (patch) | |
| tree | ef4371bec28fd740dac8ed256a2dd91d6a086541 /infra/bots/assets | |
| parent | 325ea327ff6106f5f35df437a2bbb88f566bb3c4 (diff) | |
Update mips64el_toolchain_linux to GCC 7
Change-Id: I31f4f2aff4e35dac066d208a9048ab0f96020fd1
Reviewed-on: https://skia-review.googlesource.com/118681
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/assets')
| -rw-r--r-- | infra/bots/assets/mips64el_toolchain_linux/VERSION | 2 | ||||
| -rwxr-xr-x | infra/bots/assets/mips64el_toolchain_linux/create.py | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/infra/bots/assets/mips64el_toolchain_linux/VERSION b/infra/bots/assets/mips64el_toolchain_linux/VERSION index e440e5c842..bf0d87ab1b 100644 --- a/infra/bots/assets/mips64el_toolchain_linux/VERSION +++ b/infra/bots/assets/mips64el_toolchain_linux/VERSION @@ -1 +1 @@ -3
\ No newline at end of file +4
\ No newline at end of file diff --git a/infra/bots/assets/mips64el_toolchain_linux/create.py b/infra/bots/assets/mips64el_toolchain_linux/create.py index 97a8690e30..6cb756fdf9 100755 --- a/infra/bots/assets/mips64el_toolchain_linux/create.py +++ b/infra/bots/assets/mips64el_toolchain_linux/create.py @@ -27,19 +27,19 @@ import utils # straightforward as it should be. PKGS = [ 'binutils-mips64el-linux-gnuabi64', - 'cpp-6-mips64el-linux-gnuabi64', - 'g++-6-mips64el-linux-gnuabi64', - 'gcc-6-cross-base', - 'gcc-6-mips64el-linux-gnuabi64', - 'gcc-6-mips64el-linux-gnuabi64-base', + 'cpp-7-mips64el-linux-gnuabi64', + 'g++-7-mips64el-linux-gnuabi64', + 'gcc-7-cross-base', + 'gcc-7-mips64el-linux-gnuabi64', + 'gcc-7-mips64el-linux-gnuabi64-base', 'libatomic1-mips64el-cross', 'libc6-dev-mips64el-cross', 'libc6-mips64el-cross', - 'libgcc-6-dev-mips64el-cross', + 'libgcc-7-dev-mips64el-cross', 'libgcc1-mips64el-cross', 'libgomp1-mips64el-cross', 'libmpfr6', # This is new in buster, so build machines don't have it yet. - 'libstdc++-6-dev-mips64el-cross', + 'libstdc++-7-dev-mips64el-cross', 'libstdc++6-mips64el-cross', 'linux-libc-dev-mips64el-cross', ] @@ -58,7 +58,7 @@ def create_asset(target_dir): # Remove unnecessary files that cause problems with zipping (due to dangling # symlinks). os.remove(os.path.join(parent_dir, - 'lib/gcc-cross/mips64el-linux-gnuabi64/6/libcc1.so')) + 'lib/gcc-cross/mips64el-linux-gnuabi64/7/libcc1.so')) shutil.rmtree(os.path.join(parent_dir, 'share')) # Remove usr/ prefix. for d in os.listdir(parent_dir): |