diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-11-03 15:13:28 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-11-03 15:13:28 -0700 |
| commit | da29be5ecef07781ef2cfa743300f971df05af76 (patch) | |
| tree | c81505d75cb3f5acd947654c9d3cfebbbadf831f /templates | |
| parent | 8626db29c479c39b161451d2d6860b53d9ba9d78 (diff) | |
| parent | c0072b07d5f6e171f54246c0b1e5e1a4d59b8685 (diff) | |
Merge branch 'master' into node_electron_build
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template index 42ad6c130d..2d780d74f8 100644 --- a/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_ubuntu1604_x64/Dockerfile.template @@ -39,7 +39,7 @@ # The clang-3.6 symlink for the default clang version was added # to Ubuntu 16.04 recently, so make sure it's installed. # Also install clang3.7. - RUN apt-get update && apt-get -y install clang-3.6 clang-3.7 && apt-get clean + RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib clang-3.6 clang-3.7 && apt-get clean # Define the default command. CMD ["bash"] |