aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-06-09 15:50:02 -0700
committerGravatar Vijay Pai <vpai@google.com>2016-06-09 15:50:02 -0700
commit203b20c9b26501105a1faa22132729514660dc8b (patch)
treea93263c5aa80e3bed3df9e8b9f6cddde74ecdcbb
parentb17e25ce9487fc5071f0a13d472e6148d4469c9b (diff)
Add g++
-rw-r--r--templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template4
-rw-r--r--tools/dockerfile/test/cxx_wheezy_x64/Dockerfile4
2 files changed, 6 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template
index 7956798781..e77b3d9e41 100644
--- a/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile.template
@@ -36,7 +36,9 @@
RUN apt-get update && apt-get install -y ${'\\'}
gcc-4.4 ${'\\'}
- gcc-4.4-multilib
+ gcc-4.4-multilib ${'\\'}
+ g++-4.4 ${'\\'}
+ g++-4.4-multilib
RUN wget ${openssl_fallback.base_uri + openssl_fallback.tarball}
diff --git a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
index 6f330f9166..dd9a79b1ed 100644
--- a/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
@@ -70,7 +70,9 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
RUN apt-get update && apt-get install -y \
gcc-4.4 \
- gcc-4.4-multilib
+ gcc-4.4-multilib \
+ g++-4.4 \
+ g++-4.4-multilib
RUN wget https://openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz