diff options
| author | hexcoder- <heiko@hexco.de> | 2020-04-04 18:42:51 +0200 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2020-04-09 10:23:37 +0200 |
| commit | 2f172d6c5a200184ab0bf869d2cca80cad720c73 (patch) | |
| tree | 5702adc0cd0084813653dfc67b80b77369a2d068 | |
| parent | 1eb81fdf36a165ea2703b6ccdc96ec2ece9dbfc1 (diff) | |
| download | afl++-2f172d6c5a200184ab0bf869d2cca80cad720c73.tar.gz | |
GNUmakefile: python config add --ldflags, silence tests
| -rw-r--r-- | GNUmakefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile index ff27e125..25928210 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -71,34 +71,34 @@ override CFLAGS += -Wall -g -Wno-pointer-sign \ AFL_FUZZ_FILES = $(wildcard src/afl-fuzz*.c) -ifneq "$(shell type python3m 2>/dev/null)" "" - ifneq "$(shell type python3m-config 2>/dev/null)" "" +ifneq "$(shell command -v python3m 2>/dev/null)" "" + ifneq "$(shell command -v python3m-config 2>/dev/null)" "" PYTHON_INCLUDE ?= $(shell python3m-config --includes) PYTHON_VERSION ?= $(strip $(shell python3m --version 2>&1)) # Starting with python3.8, we need to pass the `embed` flag. Earier versions didn't know this flag. ifeq "$(shell python3m-config --embed --libs 2>/dev/null | grep -q lpython && echo 1 )" "1" - PYTHON_LIB ?= $(shell python3m-config --libs --embed) + PYTHON_LIB ?= $(shell python3m-config --libs --embed --ldflags) else PYTHON_LIB ?= $(shell python3m-config --ldflags) endif endif endif -ifneq "$(shell type python3 2>/dev/null)" "" - ifneq "$(shell type python3-config 2>/dev/null)" "" +ifneq "$(shell command -v python3 2>/dev/null)" "" + ifneq "$(shell command -v python3-config 2>/dev/null)" "" PYTHON_INCLUDE ?= $(shell python3-config --includes) PYTHON_VERSION ?= $(strip $(shell python3 --version 2>&1)) # Starting with python3.8, we need to pass the `embed` flag. Earier versions didn't know this flag. ifeq "$(shell python3-config --embed --libs 2>/dev/null | grep -q lpython && echo 1 )" "1" - PYTHON_LIB ?= $(shell python3-config --libs --embed) + PYTHON_LIB ?= $(shell python3-config --libs --embed --ldflags) else PYTHON_LIB ?= $(shell python3-config --ldflags) endif endif endif -ifneq "$(shell type python 2>/dev/null)" "" - ifneq "$(shell type python-config 2>/dev/null)" "" +ifneq "$(shell command -v python 2>/dev/null)" "" + ifneq "$(shell command -v python-config 2>/dev/null)" "" PYTHON_INCLUDE ?= $(shell python-config --includes) PYTHON_LIB ?= $(shell python-config --ldflags) PYTHON_VERSION ?= $(strip $(shell python --version 2>&1)) |