about summary refs log tree commit diff
path: root/llvm_mode/Makefile
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-03-09 08:27:23 +0100
committervan Hauser <vh@thc.org>2020-03-09 08:27:23 +0100
commit0581f6ec00dbca592582c0bd23c82de524df7a03 (patch)
treebe926bc911d64b153b7650ab4a112e0550eafb8c /llvm_mode/Makefile
parenta3161b902e36185631e624e41eb1ae04d32c302b (diff)
downloadafl++-0581f6ec00dbca592582c0bd23c82de524df7a03.tar.gz
bug fixes to afl-ld and intensive README.lto.md update on errors and how to do the steps by hand, plus global code format
Diffstat (limited to 'llvm_mode/Makefile')
-rw-r--r--llvm_mode/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile
index a4c60ea4..b4746da3 100644
--- a/llvm_mode/Makefile
+++ b/llvm_mode/Makefile
@@ -136,7 +136,8 @@ override CFLAGS = -Wall \
                -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign -I ../include/ \
                -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
                -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
-               -DLLVM_VERSION=\"$(LLVMVER)\"  -DAFL_CLANG_FLTO=\"$(AFL_CLANG_FLTO)\"
+               -DLLVM_VERSION=\"$(LLVMVER)\"  -DAFL_CLANG_FLTO=\"$(AFL_CLANG_FLTO)\" \
+               -DAFL_REAL_LD=\"$(AFL_REAL_LD)\"
 ifdef AFL_TRACE_PC
   CFLAGS    += -DUSE_TRACE_PC=1
 endif
@@ -253,7 +254,7 @@ endif
 ../afl-ld: afl-ld.c
 ifneq "$(AFL_CLANG_FLTO)" ""
 ifeq "$(LLVM_LTO)" "1"
-	$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -DAFL_REAL_LD=\"$(AFL_REAL_LD)\"
+	$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
 	ln -sf afl-ld ../ld
 	@rm -f .test-instr
 	@-export AFL_QUIET=1 AFL_PATH=.. PATH="..:$(PATH)" ; ../afl-clang-lto -Wl,--afl -o .test-instr ../test-instr.c && echo "[+] afl-clang-lto and afl-ld seem to work fine :)" || echo "[!] WARNING: clang seems to have a hardcoded "'/bin/ld'" - check README.lto"