From aebe4a94a100af8a36c0646e715ebd4cfd991c0c Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:25:26 +0200
Subject: [PATCH] remove usage of OLD_LLVMPASS (#12561)

Following https://github.com/google/oss-fuzz/pull/12365
cc @maflcko
---
 projects/bearssl/Dockerfile        | 3 ---
 projects/bls-signatures/Dockerfile | 3 ---
 projects/cmake/Dockerfile          | 3 ---
 projects/firestore/Dockerfile      | 3 ---
 projects/flatbuffers/Dockerfile    | 3 ---
 projects/json/Dockerfile           | 3 ---
 projects/libecc/Dockerfile         | 3 ---
 projects/nettle/Dockerfile         | 3 ---
 projects/opencv/Dockerfile         | 3 ---
 9 files changed, 27 deletions(-)

diff --git a/projects/bearssl/Dockerfile b/projects/bearssl/Dockerfile
index 1f3a092ec507..41e9b65277ff 100644
--- a/projects/bearssl/Dockerfile
+++ b/projects/bearssl/Dockerfile
@@ -22,6 +22,3 @@ RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz-corpora
 RUN wget https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/bls-signatures/Dockerfile b/projects/bls-signatures/Dockerfile
index b28e46d97ff8..1cbe4090d777 100644
--- a/projects/bls-signatures/Dockerfile
+++ b/projects/bls-signatures/Dockerfile
@@ -26,6 +26,3 @@ RUN wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.lz
 RUN wget -q https://nim-lang.org/download/nim-2.0.8-linux_x64.tar.xz
 RUN wget -q https://nim-lang.org/download/nim-2.0.8-linux_x32.tar.xz
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/cmake/Dockerfile b/projects/cmake/Dockerfile
index 8236d193dd7a..2b7c2ef0f2a2 100644
--- a/projects/cmake/Dockerfile
+++ b/projects/cmake/Dockerfile
@@ -21,6 +21,3 @@ RUN git clone --depth 1 https://gitlab.kitware.com/cmake/cmake CMake
 RUN git clone --depth 1 https://github.com/strongcourage/fuzzing-corpus
 WORKDIR CMake
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/firestore/Dockerfile b/projects/firestore/Dockerfile
index 017c8762dfb7..bb024aa45b4d 100644
--- a/projects/firestore/Dockerfile
+++ b/projects/firestore/Dockerfile
@@ -18,6 +18,3 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget golang python python-protobuf python-six
 RUN git clone --depth 1 https://github.com/firebase/firebase-ios-sdk.git
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/flatbuffers/Dockerfile b/projects/flatbuffers/Dockerfile
index 8d150a3a81c2..83caf67c0f5d 100644
--- a/projects/flatbuffers/Dockerfile
+++ b/projects/flatbuffers/Dockerfile
@@ -20,6 +20,3 @@ RUN git clone https://github.com/google/flatbuffers
 
 WORKDIR $SRC/
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/json/Dockerfile b/projects/json/Dockerfile
index 63ac8138597a..6bf74eda4f3a 100644
--- a/projects/json/Dockerfile
+++ b/projects/json/Dockerfile
@@ -20,6 +20,3 @@ RUN apt-get update && apt-get install -y binutils make
 RUN git clone --depth 1 -b develop https://github.com/nlohmann/json.git
 WORKDIR json/
 COPY build.sh *.options parse_afl_fuzzer.dict $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/libecc/Dockerfile b/projects/libecc/Dockerfile
index 90b7e0999c77..b7d1919aacfd 100644
--- a/projects/libecc/Dockerfile
+++ b/projects/libecc/Dockerfile
@@ -26,6 +26,3 @@ RUN wget -q https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.lz
 RUN test "$(sha256sum gmp-6.2.1.tar.lz)" = "2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41  gmp-6.2.1.tar.lz"
 RUN wget -q https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile
index f667134aa904..389cef37cbb4 100644
--- a/projects/nettle/Dockerfile
+++ b/projects/nettle/Dockerfile
@@ -25,6 +25,3 @@ RUN wget https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.bz2
 RUN wget https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.lz
 RUN test "$(sha256sum gmp-6.2.1.tar.lz)" = "2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41  gmp-6.2.1.tar.lz"
 COPY build.sh $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
diff --git a/projects/opencv/Dockerfile b/projects/opencv/Dockerfile
index a23691ba9397..a6b885df7adb 100644
--- a/projects/opencv/Dockerfile
+++ b/projects/opencv/Dockerfile
@@ -22,8 +22,5 @@ WORKDIR opencv/
 
 COPY build.sh $SRC/
 COPY *.cc *.h $SRC/
-# This is to fix Fuzz Introspector build by using LLVM old pass manager
-# re https://github.com/ossf/fuzz-introspector/issues/305
-ENV OLD_LLVMPASS 1
 # Runner have memory limit 2048Mb, set imread pixel limit 712Mpix ~ 2037Mb (BGR)
 ENV OPENCV_IO_MAX_IMAGE_PIXELS=712000000