boringssl: fix broken build

Author: xingyaner

projects/boringssl/build.sh

@@ -18,8 +18,10 @@
 mkdir -p $WORK/boringssl
 cd $WORK/boringssl
 
+CXXFLAGS_LIBSTDCXX=$(echo "$CXXFLAGS" | sed 's/-stdlib=libc++//g')
+CXXFLAGS_LIBSTDCXX="$CXXFLAGS_LIBSTDCXX -stdlib=libstdc++ -DBORINGSSL_UNSAFE_FUZZER_MODE"
+CXXFLAGS_LIBCXX="$CXXFLAGS -stdlib=libc++ -DBORINGSSL_UNSAFE_FUZZER_MODE"
 CFLAGS="$CFLAGS -DBORINGSSL_UNSAFE_FUZZER_MODE"
-CXXFLAGS="$CXXFLAGS -DBORINGSSL_UNSAFE_FUZZER_MODE"
 
 CMAKE_DEFINES="-DBORINGSSL_ALLOW_CXX_RUNTIME=1"
 if [[ $CFLAGS = *sanitize=memory* ]]
@@ -28,7 +30,7 @@ then
 fi
 
 cmake -GNinja -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
-      -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+      -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS_LIBSTDCXX" \
       $CMAKE_DEFINES $SRC/boringssl/
 ninja
 
@@ -39,10 +41,10 @@ find . -name "*.a"
 for F in $fuzzerFiles; do
   fuzzerName=$(basename $F .cc)
   echo "Building fuzzer $fuzzerName"
-  $CXX $CXXFLAGS \
+  $CXX $CXXFLAGS_LIBSTDCXX \
       -D_BORINGSSL_LIBPKI_ -std=c++1z \
       -o $OUT/${fuzzerName} $LIB_FUZZING_ENGINE $F \
-      -I $SRC/boringssl/include ./libpki.a ./libssl.a  ./libcrypto.a
+      -I $SRC/boringssl/include ./libpki.a ./libssl.a  ./libcrypto.a -lstdc++
 
   if [ -d "$SRC/boringssl/fuzz/${fuzzerName}_corpus" ]; then
     zip -j $OUT/${fuzzerName}_seed_corpus.zip $SRC/boringssl/fuzz/${fuzzerName}_corpus/*
@@ -61,14 +63,15 @@ if [[ $CFLAGS != *sanitize=memory* ]]; then
     fuzzerName=$(echo ${F#*_})
     fuzzerName=$(basename $fuzzerName .cc)
     echo "Building fuzzer $fuzzerName"
-    $CXX $CXXFLAGS -I genfiles -I . -I $SRC/libprotobuf-mutator/ -I $SRC/LPM/external.protobuf/include -I include $LIB_FUZZING_ENGINE \
+    $CXX $CXXFLAGS_LIBCXX -I genfiles -I . -I $SRC/libprotobuf-mutator/ -I $SRC/LPM/external.protobuf/include -I include $LIB_FUZZING_ENGINE \
         -DNDEBUG \
         -I $SRC/boringssl/include \
         $F genfiles/asn1_pdu.pb.cc $SRC/asn1_pdu_to_der.cc $SRC/common.cc \
         ./libssl.a ./libcrypto.a \
         $SRC/LPM/src/libfuzzer/libprotobuf-mutator-libfuzzer.a \
         $SRC/LPM/src/libprotobuf-mutator.a \
         -Wl,--start-group $SRC/LPM/external.protobuf/lib/lib*.a -Wl,--end-group \
+	-lc++ \
         -o $OUT/"${fuzzerName}_lpm"
   done
 fi