From 505b4a4ec537231078e7273bb0bd6ed5de267097 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrewdkaster@gmail.com>
Date: Mon, 21 Feb 2022 16:48:21 -0700
Subject: [PATCH] serenity: Use in-tree BuildFuzzers.sh script to build fuzz
 targets (#7309)

This replaces the manual CMake invocations, as the project now will
build code generator tools in a first stage build to enable fuzzing
generated code too.
---
 projects/serenity/Dockerfile |  2 +-
 projects/serenity/build.sh   | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/projects/serenity/Dockerfile b/projects/serenity/Dockerfile
index c494759d2..0a52571e0 100644
--- a/projects/serenity/Dockerfile
+++ b/projects/serenity/Dockerfile
@@ -15,7 +15,7 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y build-essential cmake curl e2fsprogs libmpfr-dev libmpc-dev libgmp-dev ninja-build
+RUN apt-get update && apt-get install -y build-essential cmake curl ninja-build
 RUN git clone https://github.com/SerenityOS/serenity
 COPY build.sh $SRC/
 WORKDIR $SRC/serenity/Meta/Lagom
diff --git a/projects/serenity/build.sh b/projects/serenity/build.sh
index fa01830ce..f6453f2da 100755
--- a/projects/serenity/build.sh
+++ b/projects/serenity/build.sh
@@ -16,16 +16,5 @@
 ################################################################################
 
 # Now build the content
-mkdir -p build
-cd build
-cmake -GNinja \
-    -DBUILD_LAGOM=ON \
-    -DENABLE_OSS_FUZZ=ON \
-    -DCMAKE_C_COMPILER=$CC \
-    -DCMAKE_CXX_COMPILER=$CXX \
-    -DCMAKE_CXX_FLAGS="$CXXFLAGS -DOSS_FUZZ=ON" \
-    -DLINKER_FLAGS="$LIB_FUZZING_ENGINE" \
-    ..
-ninja
-cp Fuzzers/Fuzz* $OUT/
+./BuildFuzzers.sh --oss-fuzz