From a3bd1c71ca4c3a8d2c94f20e42372b3f23ffe518 Mon Sep 17 00:00:00 2001 From: hexcoder- Date: Wed, 18 Mar 2020 23:51:54 +0100 Subject: Makefiles: replace 'which' with 'type' --- gcc_plugin/Makefile | 2 +- llvm_mode/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc_plugin/Makefile b/gcc_plugin/Makefile index ce01e6f9..67737265 100644 --- a/gcc_plugin/Makefile +++ b/gcc_plugin/Makefile @@ -44,7 +44,7 @@ PLUGIN_FLAGS = -fPIC -fno-rtti -I"$(shell $(CC) -print-file-name=plugin)/include HASH=\# GCCVER = $(shell $(CC) --version 2>/dev/null | awk 'NR == 1 {print $$NF}') -GCCBINDIR = $(shell dirname `which $(CC)` 2>/dev/null ) +GCCBINDIR = $(shell dirname `type $(CC) | awk '{print $$NF}'` 2>/dev/null ) 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 diff --git a/llvm_mode/Makefile b/llvm_mode/Makefile index af7e67a9..a4045ae5 100644 --- a/llvm_mode/Makefile +++ b/llvm_mode/Makefile @@ -159,7 +159,7 @@ ifeq "$(shell uname)" "OpenBSD" CLANG_LFL += `$(LLVM_CONFIG) --libdir`/libLLVM.so endif -ifeq "$(shell echo 'int main() {return 0; }' | $(CC) -x c - -fuse-ld=`which ld` -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" +ifeq "$(shell echo 'int main() {return 0; }' | $(CC) -x c - -fuse-ld=`type ld | awk '{print $$NF}'` -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" CFLAGS += -DAFL_CLANG_FUSELD=1 endif -- cgit 1.4.1