From 89983aa9ec044b64afad3b38ac469b19056559dd Mon Sep 17 00:00:00 2001 From: Mark Gates Date: Tue, 28 May 2024 01:51:05 -0400 Subject: [PATCH] make: Using ${} for function in 1st argument of ifneq causes error; seems like GNU make bug. Move it to 2nd argument. --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e44d8c0d..78530526 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -20,7 +20,7 @@ ifeq (${MAKECMDGOALS},config) config: make.inc make.inc: force -else ifneq ($(findstring clean,${MAKECMDGOALS}),clean) +else ifneq (clean,${findstring clean,${MAKECMDGOALS}}) # For `make clean` or `make distclean`, don't include make.inc, # which could generate it. Otherwise, include make.inc. include make.inc @@ -67,7 +67,7 @@ ldflags_shared = -shared # auto-detect OS # $OSTYPE may not be exported from the shell, so echo it ostype := ${shell echo $${OSTYPE}} -ifneq ($(findstring darwin, ${ostype}),) +ifneq (,${findstring darwin, ${ostype}}) # MacOS is darwin macos = 1 # MacOS needs shared library's path set, and shared library version.