Module Name:    src
Committed By:   mrg
Date:           Sat Apr  7 22:17:52 UTC 2018

Modified Files:
        src/external/gpl3/gcc/lib/libstdc++-v3: Makefile

Log Message:
fix the grep pattern for inside a makefile.  fixes build issue
reported by thorpej on tech-toolchain - we both found the same
fix around the same time.

XXX: kamil says solaris-type hosts will fail here as they need
XXX: 'egrep' not 'grep -E'.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.32 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.33
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.32	Wed Feb  7 02:30:39 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile	Sat Apr  7 22:17:52 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2018/02/07 02:30:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.33 2018/04/07 22:17:52 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -21,7 +21,7 @@ COPTS.random.cc+=	${${ACTIVE_CC} == "cla
 .if ${MKPIC} != "no"
 libstdc++-symbols.ver:
 	cat ${DIST}/libstdc++-v3/config/abi/pre/gnu.ver ${G_port_specific_symbol_files} | \
-	${TOOL_GREP} -E -v '^[     ]*#(#| |$)' | \
+	${TOOL_GREP} -E -v '^[     ]*#(#| |$$)' | \
 	${CXX} -I${DESTDIR}/usr/include/g++ -E -P -include ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/c++config.h - > \
 	${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} && rm -f ${.TARGET}.tmp
 

Reply via email to