Module Name: src
Committed By: riastradh
Date: Sat Nov 23 02:10:13 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
bsd.lib.mk: Switch back from TOOL_GREP to grep for now.
Apparently TOOL_GREP is just broken:
$ { echo __bss_start__; echo __bss_end__; echo hello; } \
> | nbgrep -Fvx -e _end -e _fini -e _init -e __bss_end__ -e __bss_start__ -e
> __end__ -e _bss_end__
__bss_end__
hello
And the options -F, -v, -x, and -e are all standard in POSIX, so it's
not really too much to ask of the host environment for now until we
figure out whatever is wrong with TOOL_GREP.
To generate a diff of this commit:
cvs rdiff -u -r1.414 -r1.415 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.414 src/share/mk/bsd.lib.mk:1.415
--- src/share/mk/bsd.lib.mk:1.414 Fri Nov 22 16:08:43 2024
+++ src/share/mk/bsd.lib.mk Sat Nov 23 02:10:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.414 2024/11/22 16:08:43 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.415 2024/11/23 02:10:13 riastradh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -700,7 +700,7 @@ LIB_EXPSYM?= ${LIB}.expsym
.if !empty(VERSION_MAP)
_EXPSYM_PIPE_GREP= # empty
.else
-_EXPSYM_PIPE_GREP= | ${TOOL_GREP} -Fvx ${_EXPSYM_IGNORE:@_s_@-e ${_s_:Q}@}
+_EXPSYM_PIPE_GREP= | grep -Fvx ${_EXPSYM_IGNORE:@_s_@-e ${_s_:Q}@}
_EXPSYM_IGNORE+= _end
_EXPSYM_IGNORE+= _fini
_EXPSYM_IGNORE+= _init
