From 27c3423fb6f1cf568cf0e50b16a82c035945ae7c Mon Sep 17 00:00:00 2001
From: hexcoder- <heiko@hexco.de>
Date: Tue, 24 Nov 2020 19:38:55 +0100
Subject: test-pre.sh: remove old uses of afl-clang, afl-cc.c: add missing
 env.var. AFL_LLVM_LAF_ALL

---
 test/test-pre.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'test/test-pre.sh')

diff --git a/test/test-pre.sh b/test/test-pre.sh
index fc14ee0b..fc84cb47 100755
--- a/test/test-pre.sh
+++ b/test/test-pre.sh
@@ -106,14 +106,7 @@ export AFL_LLVM_INSTRUMENT=AFL
 test -e /usr/local/bin/opt && {
   export PATH="/usr/local/bin:${PATH}"
 }
-# on MacOS X we prefer afl-clang over afl-gcc, because
-# afl-gcc does not work there
-test `uname -s` = 'Darwin' -o `uname -s` = 'FreeBSD' && {
-  AFL_GCC=afl-clang
-} || {
-  AFL_GCC=afl-gcc
-}
-command -v gcc >/dev/null 2>&1 || AFL_GCC=afl-clang
+AFL_GCC=afl-gcc
 
 SYS=`uname -m`
 
@@ -135,4 +128,4 @@ test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed"
 CODE=0
 INCOMPLETE=0
 
-fi
\ No newline at end of file
+fi
-- 
cgit 1.4.1


From aca5b55b6d1f2d7079830b805e12d8585e98aa2e Mon Sep 17 00:00:00 2001
From: hexcoder- <heiko@hexco.de>
Date: Fri, 4 Dec 2020 08:46:46 +0100
Subject: test-pre.sh revert removal of afl-clang

---
 test/test-pre.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'test/test-pre.sh')

diff --git a/test/test-pre.sh b/test/test-pre.sh
index fc84cb47..4c708a68 100755
--- a/test/test-pre.sh
+++ b/test/test-pre.sh
@@ -106,7 +106,14 @@ export AFL_LLVM_INSTRUMENT=AFL
 test -e /usr/local/bin/opt && {
   export PATH="/usr/local/bin:${PATH}"
 }
-AFL_GCC=afl-gcc
+# on MacOS X we prefer afl-clang over afl-gcc, because
+# afl-gcc does not work there
+test `uname -s` = 'Darwin' -o `uname -s` = 'FreeBSD' && {
+  AFL_GCC=afl-clang
+} || {
+  AFL_GCC=afl-gcc
+}
+command -v gcc >/dev/null 2>&1 || AFL_GCC=afl-clang
 
 SYS=`uname -m`
 
-- 
cgit 1.4.1