From 6d6b5c8641fd0a666b269230ee5b4a4f90144f83 Mon Sep 17 00:00:00 2001 From: Mark Gates Date: Tue, 28 May 2024 01:50:45 -0400 Subject: [PATCH 1/2] 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 7946d27..1758c7c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,7 +22,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 @@ -69,7 +69,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. From b0ebcc23d8196d3bf996cdc4a3a0eeb80f744080 Mon Sep 17 00:00:00 2001 From: Mark Gates Date: Thu, 30 May 2024 23:48:26 -0400 Subject: [PATCH 2/2] make: sync with SLATE --- GNUmakefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 1758c7c..b75f64b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -271,13 +271,20 @@ distclean: clean #------------------------------------------------------------------------------- # debugging echo: - @echo "ostype = '${ostype}'" + @echo "---------- Options" @echo "static = '${static}'" + @echo "prefix = '${prefix}'" + @echo "abs_prefix = '${abs_prefix}'" + @echo + @echo "---------- Internal variables" + @echo "ostype = '${ostype}'" + @echo "macos = '${macos}'" @echo "id = '${id}'" @echo "last_id = '${last_id}'" @echo "abi_version = '${abi_version}'" @echo "soversion = '${soversion}'" @echo + @echo "---------- Libraries" @echo "lib_name = ${lib_name}" @echo "lib_a = ${lib_a}" @echo "lib_so = ${lib_so}" @@ -297,9 +304,11 @@ echo: @echo @echo "dep = ${dep}" @echo + @echo "---------- C++ compiler" @echo "CXX = ${CXX}" @echo "CXXFLAGS = ${CXXFLAGS}" @echo + @echo "---------- Link flags" @echo "LD = ${LD}" @echo "LDFLAGS = ${LDFLAGS}" @echo "LIBS = ${LIBS}"