Source-Changes-HG archive

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

[src/trunk]: src/tools don't run grep if we don't have the Makefile, like whe...



details:   https://anonhg.NetBSD.org/src/rev/f22fe57c6ae2
branches:  trunk
changeset: 820302:f22fe57c6ae2
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 06 17:22:51 2017 +0000

description:
don't run grep if we don't have the Makefile, like when we are building
objdirs

diffstat:

 tools/dbsym/Makefile      |  11 +++++++----
 tools/mdsetimage/Makefile |  10 +++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 6b5a92893b67 -r f22fe57c6ae2 tools/dbsym/Makefile
--- a/tools/dbsym/Makefile      Fri Jan 06 17:13:22 2017 +0000
+++ b/tools/dbsym/Makefile      Fri Jan 06 17:22:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2016/02/01 14:18:16 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2017/01/06 17:22:51 christos Exp $
 
 NOMAN= # defined
 
@@ -14,8 +14,11 @@
 
 .include "${.CURDIR}/../Makefile.host"
 
-LIBDL!=                grep -- -ldl ${TOOLCHAINOBJ}/build/ld/Makefile || echo no
+LDMAKEFILE=${TOOLCHAINOBJ}/build/ld/Makefile
+.if exists(${LDMAKEFILE})
+HAVE_LIBDL!=           grep -- -ldl ${LDMAKEFILE} || echo no
+.endif
 
-.if ${LIBDL} != "no"
-LDADD+= -ldl
+.if ${HAVE_LIBDL} != "no"
+LDADD+=        -ldl
 .endif
diff -r 6b5a92893b67 -r f22fe57c6ae2 tools/mdsetimage/Makefile
--- a/tools/mdsetimage/Makefile Fri Jan 06 17:13:22 2017 +0000
+++ b/tools/mdsetimage/Makefile Fri Jan 06 17:22:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2016/02/01 14:17:21 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2017/01/06 17:22:51 christos Exp $
 
 NOMAN= # defined
 
@@ -14,8 +14,12 @@
 
 .include "${.CURDIR}/../Makefile.host"
 
-LIBDL!=                grep -- -ldl ${TOOLCHAINOBJ}/build/ld/Makefile || echo no
 
-.if ${LIBDL} != "no"
+LDMAKEFILE=${TOOLCHAINOBJ}/build/ld/Makefile
+.if exists(${LDMAKEFILE})
+HAVE_LIBDL!=           grep -- -ldl ${LDMAKEFILE} || echo no
+.endif
+
+.if ${HAVE_LIBDL} != "no"
 LDADD+=        -ldl
 .endif



Home | Main Index | Thread Index | Old Index