From 47484451d54b9912276ba1061552846190fea0a1 Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Fri, 10 Jul 2020 14:50:39 -0700 Subject: [PATCH] [infra] Build honggfuzz with -D_HF_LINUX_NO_BFD (#3886). (#4107) * [infra] Build honggfuzz with -D_HF_LINUX_NO_BFD (#3886). * dummy edit to trigger CI --- infra/base-images/base-builder/precompile_honggfuzz | 5 +++-- projects/zlib-ng/build.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/infra/base-images/base-builder/precompile_honggfuzz b/infra/base-images/base-builder/precompile_honggfuzz index 152922d79..2565bb83f 100755 --- a/infra/base-images/base-builder/precompile_honggfuzz +++ b/infra/base-images/base-builder/precompile_honggfuzz @@ -31,8 +31,9 @@ apt-get install -y ${PACKAGES[@]} pushd $SRC/honggfuzz > /dev/null make clean # These CFLAGs match honggfuzz's default, with the exception of -mtune to -# improve portability. -CC=clang CFLAGS="-O3 -funroll-loops" make +# improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions +# from the filenames. +CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make # libhfuzz.a will be added by CC/CXX linker directly during linking, # but it's defined here to satisfy the build infrastructure diff --git a/projects/zlib-ng/build.sh b/projects/zlib-ng/build.sh index 10d953588..cb225ec36 100755 --- a/projects/zlib-ng/build.sh +++ b/projects/zlib-ng/build.sh @@ -18,6 +18,7 @@ export LDSHARED=$CXX export LDFLAGS="$CFLAGS -stdlib=libc++" ./configure + sed -i "/^LDSHARED=.*/s#=.*#=$CXX#" Makefile sed -i 's/$(CC) $(LDFLAGS)/$(CXX) $(LDFLAGS)/g' Makefile