diff options
| author |  Nico Weber <thakis@chromium.org> | 2020-11-29 16:39:21 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-11-29 13:39:21 -0800 |
| commit | f40f590cea46424fa06a90c14315de3e4ca8bfe7 (patch) | |
| tree | 09f54e881e7a454ba39adca236fa8b388a973c00 /projects | |
| parent | f25e7e093773b99344eb2e4415fca24fc9c1f049 (diff) | |
serenity: Build with ninja, and add @bugaevc to cc list (#4742)
* serenity: Build using ninja instead of make
It has a better default -j, which means local builds are much faster.
Also, the output is more pleasant to look at.
* serenity: Add bugaevc as requested on #4738
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/serenity/Dockerfile | 2 | ||||
| -rwxr-xr-x | projects/serenity/build.sh | 5 | ||||
| -rw-r--r-- | projects/serenity/project.yaml | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/projects/serenity/Dockerfile b/projects/serenity/Dockerfile index 7b2348c6..138631c3 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 libmpfr-dev libmpc-dev libgmp-dev e2fsprogs +RUN apt-get update && apt-get install -y build-essential cmake curl e2fsprogs libmpfr-dev libmpc-dev libgmp-dev ninja-build RUN git clone https://github.com/SerenityOS/serenity WORKDIR $SRC COPY build.sh $SRC/ diff --git a/projects/serenity/build.sh b/projects/serenity/build.sh index 3f11bbfa..3cce9976 100755 --- a/projects/serenity/build.sh +++ b/projects/serenity/build.sh @@ -19,13 +19,14 @@ cd serenity/Meta/Lagom mkdir build cd build -cmake -DBUILD_LAGOM=ON \ +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" \ .. -make +ninja cp Fuzzers/Fuzz* $OUT/ diff --git a/projects/serenity/project.yaml b/projects/serenity/project.yaml index 2a4384b0..93c58a07 100644 --- a/projects/serenity/project.yaml +++ b/projects/serenity/project.yaml @@ -6,6 +6,7 @@ auto_ccs: - "mail@linusgroh.de" - "ali.mpfard@gmail.com" - "luke.wilde@live.co.uk" + - "bugaevc@serenityos.org" # Bug reports are public by default: view_restrictions: none |