From 1b758e4d6b14cc7afdd8c90e80b2afef140d6331 Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Tue, 11 Feb 2020 20:15:01 +0100 Subject: compatibility for GNU make 4.3, which behaves different for lines with '#' like in ifeq "$(shell echo '\#include ... Now make v 4.3 wants ifeq "$(shell echo '#include ... In order to get it working with all GNU makes, we use a make variable for '#' called HASH --- llvm_mode/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'llvm_mode') diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile index 6e0a27af..6fa04e2c 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -18,12 +18,13 @@ # For Heiko: #TEST_MMAP=1 +HASH=\# PREFIX ?= /usr/local HELPER_PATH = $(PREFIX)/lib/afl BIN_PATH = $(PREFIX)/bin -VERSION = $(shell grep '^\#define VERSION ' ../config.h | cut -d '"' -f2) +VERSION = $(shell grep '^$(HASH)define VERSION ' ../config.h | cut -d '"' -f2) ifeq "$(shell uname)" "OpenBSD" LLVM_CONFIG ?= $(BIN_PATH)/llvm-config @@ -116,7 +117,7 @@ endif CLANGVER = $(shell $(CC) --version | sed -E -ne '/^.*version\ ([0-9]\.[0-9]\.[0-9]).*/s//\1/p') -ifeq "$(shell echo '\#include @\#include @int main() { int _id = shmget(IPC_PRIVATE, 65536, IPC_CREAT | IPC_EXCL | 0600); shmctl(_id, IPC_RMID, 0); return 0;}' | tr @ '\n' | $(CC) -x c - -o .test2 2>/dev/null && echo 1 || echo 0 ; rm -f .test2 )" "1" +ifeq "$(shell echo '$(HASH)include @$(HASH)include @int main() { int _id = shmget(IPC_PRIVATE, 65536, IPC_CREAT | IPC_EXCL | 0600); shmctl(_id, IPC_RMID, 0); return 0;}' | tr @ '\n' | $(CC) -x c - -o .test2 2>/dev/null && echo 1 || echo 0 ; rm -f .test2 )" "1" SHMAT_OK=1 else SHMAT_OK=0 -- cgit 1.4.1