From 31a1fbae33fc610dc799821afb5ce8572509648d Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 23 Jul 2024 14:06:19 +0200 Subject: Fix LLVM mode build on MacOS --- GNUmakefile.llvm | 10 +++++----- custom_mutators/gramatron/json-c | 2 +- custom_mutators/grammar_mutator/grammar_mutator | 2 +- nyx_mode/QEMU-Nyx | 2 +- nyx_mode/libnyx | 2 +- nyx_mode/packer | 2 +- qemu_mode/qemuafl | 2 +- unicorn_mode/unicornafl | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm index 8b4c6054..52ff778c 100644 --- a/GNUmakefile.llvm +++ b/GNUmakefile.llvm @@ -61,7 +61,6 @@ LLVM_HAVE_LTO := $(shell test $(LLVM_MAJOR) -ge 12 && echo 1 || e LLVM_BINDIR := $(shell $(LLVM_CONFIG) --bindir 2>/dev/null) LLVM_LIBDIR := $(shell $(LLVM_CONFIG) --libdir 2>/dev/null) LLVM_STDCXX := gnu++11 -LLVM_APPLE_XCODE := $(shell $(CC) -v 2>&1 | grep -q Apple && echo 1 || echo 0) LLVM_LTO := 0 LLVM_UNSUPPORTED := $(shell echo "$(LLVMVER)" | grep -E -q '^[0-2]\.|^3\.[0-8]\.' && echo 1 || echo 0) # Uncomment to see the values assigned above @@ -112,10 +111,6 @@ ifeq "$(LLVM_LTO)" "0" $(info [+] llvm_mode detected llvm < 12, afl-lto LTO will not be build.) endif -ifeq "$(LLVM_APPLE_XCODE)" "1" - $(warning llvm_mode will not compile with Xcode clang...) -endif - # We were using llvm-config --bindir to get the location of clang, but # this seems to be busted on some distros, so using the one in $PATH is # probably better. @@ -123,6 +118,11 @@ endif CC = $(LLVM_BINDIR)/clang CXX = $(LLVM_BINDIR)/clang++ +LLVM_APPLE_XCODE := $(shell $(CC) -v 2>&1 | grep -q Apple && echo 1 || echo 0) +ifeq "$(LLVM_APPLE_XCODE)" "1" + $(warning llvm_mode will not compile with Xcode clang...) +endif + # llvm-config --bindir may not providing a valid path, so ... ifeq "$(shell test -e $(CC) || echo 1 )" "1" # however we must ensure that this is not a "CC=gcc make" diff --git a/custom_mutators/gramatron/json-c b/custom_mutators/gramatron/json-c index af8dd4a3..11546bfd 160000 --- a/custom_mutators/gramatron/json-c +++ b/custom_mutators/gramatron/json-c @@ -1 +1 @@ -Subproject commit af8dd4a307e7b837f9fa2959549548ace4afe08b +Subproject commit 11546bfd07a575c47416924cb98de3d33a4e6424 diff --git a/custom_mutators/grammar_mutator/grammar_mutator b/custom_mutators/grammar_mutator/grammar_mutator index 05d8f537..ff4e5a26 160000 --- a/custom_mutators/grammar_mutator/grammar_mutator +++ b/custom_mutators/grammar_mutator/grammar_mutator @@ -1 +1 @@ -Subproject commit 05d8f537f8d656f0754e7ad5dcc653c42cb4f8ff +Subproject commit ff4e5a265daf5d88c4a636fb6a2c22b1d733db09 diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx index e5e1c4c2..60c216bc 160000 --- a/nyx_mode/QEMU-Nyx +++ b/nyx_mode/QEMU-Nyx @@ -1 +1 @@ -Subproject commit e5e1c4c21ff9c4dc80e6409d4eab47146c6024cd +Subproject commit 60c216bc9e4c79834716d4099993d8397a3a8fd9 diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx index 6833d236..2da7f08b 160000 --- a/nyx_mode/libnyx +++ b/nyx_mode/libnyx @@ -1 +1 @@ -Subproject commit 6833d236dfe785a8a23d8c8d79e74c99fa635004 +Subproject commit 2da7f08b6e0267ccfe64e1320b24cdb29223459c diff --git a/nyx_mode/packer b/nyx_mode/packer index bcf3e248..202bace8 160000 --- a/nyx_mode/packer +++ b/nyx_mode/packer @@ -1 +1 @@ -Subproject commit bcf3e248b660764f48af54232a3388389a2dfc22 +Subproject commit 202bace888d237e4e8f4507d0eba6791a811554d diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl index 847b43ac..b0abbe2e 160000 --- a/qemu_mode/qemuafl +++ b/qemu_mode/qemuafl @@ -1 +1 @@ -Subproject commit 847b43acb11530e775013dc24b54c6e27406179c +Subproject commit b0abbe2e74ed74ff6ff25b5ea3110d27ba978001 diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl index 4b4fdab1..63aab0f7 160000 --- a/unicorn_mode/unicornafl +++ b/unicorn_mode/unicornafl @@ -1 +1 @@ -Subproject commit 4b4fdab161c15529affcc1e785d779e318b882ab +Subproject commit 63aab0f752ba1d40a1c4de6988a78cd1e6dcc1c7 -- cgit 1.4.1 From c0d53a1aa790c5225b5bebd16b7594abe0fc0be1 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Tue, 23 Jul 2024 14:42:43 +0200 Subject: oops --- .gitignore | 1 + custom_mutators/gramatron/json-c | 2 +- custom_mutators/grammar_mutator/grammar_mutator | 2 +- nyx_mode/QEMU-Nyx | 2 +- nyx_mode/libnyx | 2 +- nyx_mode/packer | 2 +- qemu_mode/qemuafl | 2 +- unicorn_mode/unicornafl | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8e191e29..9ac577d3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.pyc *.so *.swp +.DS_Store .sync_tmp .test .test2 diff --git a/custom_mutators/gramatron/json-c b/custom_mutators/gramatron/json-c index 11546bfd..af8dd4a3 160000 --- a/custom_mutators/gramatron/json-c +++ b/custom_mutators/gramatron/json-c @@ -1 +1 @@ -Subproject commit 11546bfd07a575c47416924cb98de3d33a4e6424 +Subproject commit af8dd4a307e7b837f9fa2959549548ace4afe08b diff --git a/custom_mutators/grammar_mutator/grammar_mutator b/custom_mutators/grammar_mutator/grammar_mutator index ff4e5a26..05d8f537 160000 --- a/custom_mutators/grammar_mutator/grammar_mutator +++ b/custom_mutators/grammar_mutator/grammar_mutator @@ -1 +1 @@ -Subproject commit ff4e5a265daf5d88c4a636fb6a2c22b1d733db09 +Subproject commit 05d8f537f8d656f0754e7ad5dcc653c42cb4f8ff diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx index 60c216bc..e5e1c4c2 160000 --- a/nyx_mode/QEMU-Nyx +++ b/nyx_mode/QEMU-Nyx @@ -1 +1 @@ -Subproject commit 60c216bc9e4c79834716d4099993d8397a3a8fd9 +Subproject commit e5e1c4c21ff9c4dc80e6409d4eab47146c6024cd diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx index 2da7f08b..6833d236 160000 --- a/nyx_mode/libnyx +++ b/nyx_mode/libnyx @@ -1 +1 @@ -Subproject commit 2da7f08b6e0267ccfe64e1320b24cdb29223459c +Subproject commit 6833d236dfe785a8a23d8c8d79e74c99fa635004 diff --git a/nyx_mode/packer b/nyx_mode/packer index 202bace8..bcf3e248 160000 --- a/nyx_mode/packer +++ b/nyx_mode/packer @@ -1 +1 @@ -Subproject commit 202bace888d237e4e8f4507d0eba6791a811554d +Subproject commit bcf3e248b660764f48af54232a3388389a2dfc22 diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl index b0abbe2e..847b43ac 160000 --- a/qemu_mode/qemuafl +++ b/qemu_mode/qemuafl @@ -1 +1 @@ -Subproject commit b0abbe2e74ed74ff6ff25b5ea3110d27ba978001 +Subproject commit 847b43acb11530e775013dc24b54c6e27406179c diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl index 63aab0f7..4b4fdab1 160000 --- a/unicorn_mode/unicornafl +++ b/unicorn_mode/unicornafl @@ -1 +1 @@ -Subproject commit 63aab0f752ba1d40a1c4de6988a78cd1e6dcc1c7 +Subproject commit 4b4fdab161c15529affcc1e785d779e318b882ab -- cgit 1.4.1