aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-06-17 18:40:13 -0700
committerGravatar GitHub <noreply@github.com>2016-06-17 18:40:13 -0700
commit56f98620bb46560cf2cb37c409cbdf3e80986812 (patch)
tree74e310007478032b89f2aea412c0b4a2eed96bc2 /tools/dockerfile
parentfa1433a4b6b0d6bbe817b4ab5f51f6167ecd837a (diff)
parent7b4dc532dd37271f883f9b30f28c7dd50baf41cb (diff)
Merge pull request #6863 from vjpai/wheezy
Make C++ compile and run under gcc-4.4
Diffstat (limited to 'tools/dockerfile')
-rw-r--r--tools/dockerfile/test/cxx_wheezy_x64/Dockerfile4
1 files changed, 3 insertions, 1 deletions
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