diff options
| author | van Hauser <vh@thc.org> | 2022-10-11 15:40:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 15:40:55 +0200 |
| commit | cbfa5207ba2853e249ffb256d99880368ee224e0 (patch) | |
| tree | 0ca719900045ab9171b9fb2590b2323e31e9bd5f /GNUmakefile.llvm | |
| parent | 7e0171006a32bf6b510e08df76ca6d8555272140 (diff) | |
| parent | bac6ba89074019e0f095774ecebc435970f4940d (diff) | |
| download | afl++-cbfa5207ba2853e249ffb256d99880368ee224e0.tar.gz | |
Merge pull request #1551 from AFLplusplus/dev 4.04c
push to stable
Diffstat (limited to 'GNUmakefile.llvm')
| -rw-r--r-- | GNUmakefile.llvm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm index c37c4a51..2349e587 100644 --- a/GNUmakefile.llvm +++ b/GNUmakefile.llvm @@ -214,6 +214,17 @@ ifeq "$(LLVM_LTO)" "1" ifeq "$(AFL_REAL_LD)" "" ifneq "$(shell readlink $(LLVM_BINDIR)/ld.lld 2>&1)" "" AFL_REAL_LD = $(LLVM_BINDIR)/ld.lld + else ifneq "$(shell command -v ld.lld 2>/dev/null)" "" + AFL_REAL_LD = $(shell command -v ld.lld) + TMP_LDLDD_VERSION = $(shell $(AFL_REAL_LD) --version | awk '{ print $$2 }') + ifeq "$(LLVMVER)" "$(TMP_LDLDD_VERSION)" + $(warning ld.lld found in a weird location ($(AFL_REAL_LD)), but its the same version as LLVM so we will allow it) + else + $(warning ld.lld found in a weird location ($(AFL_REAL_LD)) and its of a different version than LLMV ($(TMP_LDLDD_VERSION) vs. $(LLVMVER)) - cannot enable LTO mode) + AFL_REAL_LD= + LLVM_LTO = 0 + endif + undefine TMP_LDLDD_VERSION else $(warning ld.lld not found, cannot enable LTO mode) LLVM_LTO = 0 @@ -229,7 +240,7 @@ AFL_CLANG_FUSELD= ifeq "$(LLVM_LTO)" "1" ifeq "$(shell echo 'int main() {return 0; }' | $(CLANG_BIN) -x c - -fuse-ld=`command -v ld` -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" AFL_CLANG_FUSELD=1 - ifeq "$(shell echo 'int main() {return 0; }' | $(CLANG_BIN) -x c - -fuse-ld=ld.lld --ld-path=$(LLVM_BINDIR)/ld.lld -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" + ifeq "$(shell echo 'int main() {return 0; }' | $(CLANG_BIN) -x c - -fuse-ld=ld.lld --ld-path=$(AFL_REAL_LD) -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" AFL_CLANG_LDPATH=1 endif else |