From 7048975d6a98b8d76304992371102efb83cc84de Mon Sep 17 00:00:00 2001 From: Kuang-che Wu Date: Wed, 7 Dec 2016 22:47:37 +0800 Subject: [PATCH] Fix parallel make command (#144) 'make -j' will make targets parallelly. In other words, "clean" may run after "all" for 'make -j clean all' line. --- projects/freetype2/build.sh | 3 ++- projects/libpng/build.sh | 3 ++- projects/libtsm/build.sh | 3 ++- projects/libxml2/build.sh | 3 ++- projects/pcre2/build.sh | 3 ++- projects/woff2/build.sh | 3 ++- projects/zlib/build.sh | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/projects/freetype2/build.sh b/projects/freetype2/build.sh index 710f533d9..cb025552e 100755 --- a/projects/freetype2/build.sh +++ b/projects/freetype2/build.sh @@ -18,7 +18,8 @@ ./autogen.sh ./configure -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 \ -I./include -I. \ diff --git a/projects/libpng/build.sh b/projects/libpng/build.sh index a5d4760fe..b9a0444de 100755 --- a/projects/libpng/build.sh +++ b/projects/libpng/build.sh @@ -23,7 +23,8 @@ mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa # build the library. autoreconf -f -i ./configure -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all # build libpng_read_fuzzer $CXX $CXXFLAGS -std=c++11 -I. -lz \ diff --git a/projects/libtsm/build.sh b/projects/libtsm/build.sh index e2260c2ef..710d4cd21 100755 --- a/projects/libtsm/build.sh +++ b/projects/libtsm/build.sh @@ -17,7 +17,8 @@ # build the library. ./autogen.sh -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all # build your fuzzer(s) $CC $CFLAGS -c $SRC/libtsm_fuzzer.c -Isrc/tsm -o $SRC/libtsm_fuzzer.o diff --git a/projects/libxml2/build.sh b/projects/libxml2/build.sh index 12cb3ad19..93f3195de 100755 --- a/projects/libxml2/build.sh +++ b/projects/libxml2/build.sh @@ -18,7 +18,8 @@ ./autogen.sh ./configure -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all for fuzzer in libxml2_xml_read_memory_fuzzer libxml2_xml_regexp_compile_fuzzer; do $CXX $CXXFLAGS -std=c++11 -Iinclude/ \ diff --git a/projects/pcre2/build.sh b/projects/pcre2/build.sh index b2ee702c6..1ceccd946 100755 --- a/projects/pcre2/build.sh +++ b/projects/pcre2/build.sh @@ -20,7 +20,8 @@ cd pcre2 # build project ./autogen.sh ./configure --enable-fuzz-support --enable-never-backslash-C --with-match-limit=1000 --with-match-limit-recursion=1000 -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all # build fuzzer $CXX $CXXFLAGS -o $OUT/pcre2_fuzzer \ diff --git a/projects/woff2/build.sh b/projects/woff2/build.sh index 6d113559c..87f34101c 100755 --- a/projects/woff2/build.sh +++ b/projects/woff2/build.sh @@ -26,7 +26,8 @@ cat Makefile | sed -e "s/-no-canonical-prefixes//" \ mv Makefile.temp Makefile # woff2 uses LFLAGS instead of LDFLAGS. -make -j$(nproc) CC="$CC $CFLAGS" CXX="$CXX $CXXFLAGS" clean all +make clean +make -j$(nproc) CC="$CC $CFLAGS" CXX="$CXX $CXXFLAGS" all # To avoid multiple main() definitions. rm src/woff2_compress.o src/woff2_decompress.o diff --git a/projects/zlib/build.sh b/projects/zlib/build.sh index 50f5cbd96..f8aebe24b 100755 --- a/projects/zlib/build.sh +++ b/projects/zlib/build.sh @@ -1,7 +1,8 @@ #!/bin/bash -eu ./configure -make -j$(nproc) clean all +make -j$(nproc) clean +make -j$(nproc) all $CXX $CXXFLAGS -std=c++11 -I. \ $SRC/zlib_uncompress_fuzzer.cc -o $OUT/zlib_uncompress_fuzzer \