From 0061b6c4ec60f462424f4e03b1169398d61e9eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net> Date: Sun, 29 Dec 2024 22:12:37 -0500 Subject: [PATCH] Use `tail -n 1` intead of `grep -v '#'` Apple GNU make treats unescaped # in variables as starting a comment. But GNU grep >= v3.8 will spew a warning with an extra backslash there. --- src/build/Common.gmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/Common.gmake b/src/build/Common.gmake index 251998e62c..95fe24a09f 100644 --- a/src/build/Common.gmake +++ b/src/build/Common.gmake @@ -179,7 +179,7 @@ endif # Compiler-specific options CFLAGS += -MMD -MP CC ?= gcc -CCPRE ?= ${shell if [ `echo __clang__ | $(CC) -E - | grep -v '^#'` != __clang__ ] ; then echo clang ; elif [ `echo __INTEL_COMPILER | $(CC) -E - | grep -v '^#'` != __INTEL_COMPILER ] ; then echo icc ; else echo gcc ; fi} +CCPRE ?= ${shell if [ `echo __clang__ | $(CC) -E - | tail -n 1` != __clang__ ] ; then echo clang ; elif [ `echo __INTEL_COMPILER | $(CC) -E - | tail -n 1` != __INTEL_COMPILER ] ; then echo icc ; else echo gcc ; fi} ifeq ($(CCPRE),clang) ifeq ($(CC),cc) CXX := c++ -- GitLab