drop libfuzzer best, just update libafl_libfuzzer

Author: addisoncrump

fuzzers/libafl_libfuzzer/builder.Dockerfile

@@ -34,9 +34,9 @@ RUN if which rustup; then rustup self uninstall -y; fi && \
 # Download libafl.
 RUN git clone https://github.com/AFLplusplus/libafl /libafl && \
     cd /libafl && \
-    git checkout defe9084aed5a80ac32fe9a1f3ff00baf97738c6 && \
+    git checkout ed4178ecd12636fa054b18d1fc716ac414e90440 && \
     unset CFLAGS CXXFLAGS && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
     cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \
-    env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench && \
-    cp ./target/release-fuzzbench/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a
+    env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" ./build.sh release-fuzzbench && \
+    cp ./libFuzzer.a /usr/lib/libFuzzer.a

fuzzers/libafl_libfuzzer/fuzzer.py

@@ -48,15 +48,6 @@ def build():
     os.environ['CC'] = 'clang'
     os.environ['CXX'] = 'clang++'
 
-    # merge all of our lib into a single .o, then pack that into a static lib
-    subprocess.check_call([
-        '/usr/bin/ld', '-Ur', '--whole-archive', '/usr/lib/libFuzzer.a', '-o',
-        '/tmp/libFuzzerMerged.o'
-    ])
-    subprocess.check_call(['/usr/bin/rm', '/usr/lib/libFuzzer.a'])
-    subprocess.check_call(
-        ['/usr/bin/ar', 'cr', '/usr/lib/libFuzzer.a', '/tmp/libFuzzerMerged.o'])
-
     os.environ['FUZZER_LIB'] = '/usr/lib/libFuzzer.a'
 
     utils.build_benchmark()