From 633a3feab9f7cf98794eebad81cec730042d7e9b Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Thu, 25 Jun 2020 17:51:48 +0200
Subject: fix makefile

---
 GNUmakefile | 15 ++++++++-------
 TODO.md     |  2 --
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index b154bbda..ad7169cd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -199,12 +199,12 @@ ifneq "$(filter Linux GNU%,$(shell uname))" ""
 endif
 
 ifneq "$(findstring FreeBSD, $(shell uname))" ""
-  CFLAGS  += -pthread
+  override CFLAGS  += -pthread
   LDFLAGS += -lpthread
 endif
 
 ifneq "$(findstring NetBSD, $(shell uname))" ""
-  CFLAGS  += -pthread
+  override CFLAGS  += -pthread
   LDFLAGS += -lpthread
 endif
 
@@ -244,7 +244,7 @@ endif
 
 ifdef ASAN_BUILD
   $(info Compiling ASAN version of binaries)
-  CFLAGS+=$(ASAN_CFLAGS)
+  override CFLAGS+=$(ASAN_CFLAGS)
   LDFLAGS+=$(ASAN_LDFLAGS)
 endif
 
@@ -252,14 +252,15 @@ ifeq "$(shell echo '$(HASH)include <sys/ipc.h>@$(HASH)include <sys/shm.h>@int ma
 	SHMAT_OK=1
 else
 	SHMAT_OK=0
-	CFLAGS+=-DUSEMMAP=1
+	override CFLAGS+=-DUSEMMAP=1
 	LDFLAGS+=-Wno-deprecated-declarations
 endif
 
-ifeq "$(TEST_MMAP)" "1"
+ifdef TEST_MMAP
 	SHMAT_OK=0
-	CFLAGS+=-DUSEMMAP=1
-	LDFLAGS+=-Wno-deprecated-declarations
+	override CFLAGS += -DUSEMMAP=1
+	LDFLAGS += -Wno-deprecated-declarations
+else
 endif
 
 all:	test_x86 test_shm test_python ready $(PROGS) afl-as test_build all_done
diff --git a/TODO.md b/TODO.md
index 7043b9a6..55b886e4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,9 +4,7 @@
 
  - AFL_MAP_SIZE for qemu_mode and unicorn_mode
  - namespace for targets? e.g. network
- - libradamsa as a custom module?
  - learn from honggfuzz (mutations, maybe ptrace?)
- - mutations from compiler fuzzer, e.g. https://github.com/agroce/afl-compiler-fuzzer/blob/2758cbfa32621ddfee5c8da6adf59a9531367263/afl-fuzz.c#L5077
  - CPU affinity for many cores? There seems to be an issue > 96 cores
 
 ## Further down the road
-- 
cgit 1.4.1