From 91acda261116da7707a197387777b16dd41bdd2a Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Tue, 6 Sep 2022 17:41:13 +1000 Subject: [PATCH] Centipede fixes. (#8417) - Replace newlines with spaces in centipede/clang-flags.txt. Build systems don't like them. - Fix a missing newline in output logs. --- infra/base-images/base-builder/compile_centipede | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/base-images/base-builder/compile_centipede b/infra/base-images/base-builder/compile_centipede index 6e4cf41dd..8fa5aa049 100755 --- a/infra/base-images/base-builder/compile_centipede +++ b/infra/base-images/base-builder/compile_centipede @@ -15,7 +15,7 @@ # ################################################################################ -echo -n "Skipping compilation; using precompiled centipede" +echo "Skipping compilation; using precompiled centipede" export BIN_DIR="$SRC/centipede/bazel-bin/" @@ -26,7 +26,7 @@ fi cp "$BIN_DIR/libcentipede_runner.pic.a" "$LIB_FUZZING_ENGINE" export DFTRACING_FLAGS='-fsanitize-coverage=trace-loads' -export CENTIPEDE_FLAGS=`cat "$SRC/centipede/clang-flags.txt"` +export CENTIPEDE_FLAGS=`cat "$SRC/centipede/clang-flags.txt" | tr '\n' ' '` export LIBRARIES_FLAGS="-ldl -lrt -lpthread $SRC/centipede/weak.o" export CC='/clang/bin/clang' export CCC='/clang/bin/clang++'