Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/conf sys/conf: remove useless dollars from Makefile.kern...



details:   https://anonhg.NetBSD.org/src/rev/e0b8c23de331
branches:  trunk
changeset: 950817:e0b8c23de331
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Jan 31 23:17:21 2021 +0000

description:
sys/conf: remove useless dollars from Makefile.kern.inc

When parsing a variable modifier such as :C or :S, all '$' but the very
last are silently swallowed.

See usr.bin/make/unit-tests/varmod-subst.mk for details.

Since August 2020, make has a strict lint mode that is activated by
passing it the option -dL.  In that mode, these redundant '$' are not
accepted anymore.

diffstat:

 sys/conf/Makefile.kern.inc |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 45c2f874acc9 -r e0b8c23de331 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Sun Jan 31 22:45:46 2021 +0000
+++ b/sys/conf/Makefile.kern.inc        Sun Jan 31 23:17:21 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.276 2020/09/06 07:20:29 mrg Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.277 2021/01/31 23:17:21 rillig Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -282,7 +282,7 @@
 # Generate list of *.o files to pass to ${LD}, preserving order.
 #      x/y/z/a.[csS] -> a.[csS]
 #      a.[csS] -> a.o
-OBJS=  ${ALLFILES:C|^.*/([^/]*\.[csS])$$|\1|:C|^(.*)\.[csS]$$|\1.o|}
+OBJS=  ${ALLFILES:C|^.*/([^/]*\.[csS])$|\1|:C|^(.*)\.[csS]$|\1.o|}
 
 CFILES=        ${ALLFILES:M*.c}
 SFILES=        ${ALLFILES:M*.[sS]}
@@ -297,7 +297,7 @@
 SRCS=  ${CSRCS} ${SSRCS}
 
 .else # ___USE_SUFFIX_RULES___
-OBJS=  ${ALLFILES:C|\.[csS]$$|.o|}
+OBJS=  ${ALLFILES:C|\.[csS]$|.o|}
 SRCS=  ${ALLFILES:M*.[csS]}
 .endif # ___USE_SUFFIX_RULES___
 



Home | Main Index | Thread Index | Old Index