From a8394ce0b643a4ea84d01a9280b50aa80ae74ad5 Mon Sep 17 00:00:00 2001
From: Mike Aizatsky <aizatsky@google.com>
Date: Thu, 28 Jul 2016 13:46:35 -0700
Subject: [PATCH] adding make to Dockerfiles

---
 expat/Dockerfile                 | 2 +-
 expat/build.sh                   | 2 +-
 freetype2/Dockerfile             | 3 +--
 freetype2/build.sh               | 2 +-
 infra/base-images/base-clang/env | 3 ++-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/expat/Dockerfile b/expat/Dockerfile
index cf92ca0f6..d57215fed 100644
--- a/expat/Dockerfile
+++ b/expat/Dockerfile
@@ -16,6 +16,6 @@
 
 FROM ossfuzz/base-libfuzzer
 MAINTAINER mike.aizatsky@gmail.com
-RUN apt-get install -y autoconf automake libtool docbook2x
+RUN apt-get install -y make autoconf automake libtool docbook2x
 
 CMD /src/oss-fuzz/expat/build.sh
diff --git a/expat/build.sh b/expat/build.sh
index d5aa21ca3..0a71fb7f7 100755
--- a/expat/build.sh
+++ b/expat/build.sh
@@ -7,6 +7,6 @@ cd /workspace/expat
 ./configure
 make clean all
 
-$CXX $CXXFLAGS -std=c++11 -Ilib/ \
+$CXX $CXXFLAGS $LDFLAGS -std=c++11 -Ilib/ \
     /src/oss-fuzz/expat/parse_fuzzer.cc -o /out/parse_fuzzer \
     /work/libfuzzer/*.o .libs/libexpat.a
diff --git a/freetype2/Dockerfile b/freetype2/Dockerfile
index c440065fa..77e9b1800 100644
--- a/freetype2/Dockerfile
+++ b/freetype2/Dockerfile
@@ -16,7 +16,6 @@
 
 FROM ossfuzz/base-libfuzzer
 MAINTAINER mike.aizatsky@gmail.com
-RUN apt-get install -y autoconf libtool libarchive-dev
+RUN apt-get install -y make autoconf libtool libarchive-dev
 
 CMD /src/oss-fuzz/freetype2/build.sh
-
diff --git a/freetype2/build.sh b/freetype2/build.sh
index 939ce24c3..81060f680 100755
--- a/freetype2/build.sh
+++ b/freetype2/build.sh
@@ -23,7 +23,7 @@ cd /workspace/
 ./configure
 make
 
-$CXX $CXXFLAGS -std=c++11 ./src/tools/ftfuzzer/ftfuzzer.cc \
+$CXX $CXXFLAGS $LDFLAGS -std=c++11 ./src/tools/ftfuzzer/ftfuzzer.cc \
   ./objs/*.o /work/libfuzzer/*.o \
    -nodefaultlibs -Wl,-Bdynamic -lpthread -lrt -lm -ldl -lgcc_s -lgcc -lc \
    -Wl,-Bstatic -lc++ -lc++abi \
diff --git a/infra/base-images/base-clang/env b/infra/base-images/base-clang/env
index 6cbcdec3b..6510d8f67 100644
--- a/infra/base-images/base-clang/env
+++ b/infra/base-images/base-clang/env
@@ -27,8 +27,9 @@ echo "Done."
 popd > /dev/null
 
 export CFLAGS="-g $sanitizer_flags $cov_flags"
-export LIBCXX_FLAGS="-stdlib=libc++ -lc++abi"
+export LIBCXX_FLAGS="-stdlib=libc++"
 export CXXFLAGS="$CFLAGS $LIBCXX_FLAGS "
+export LDFLAGS="-lc++abi"
 
 echo "CC=$CC"
 echo "CXX=$CXX"