Module Name: src
Committed By: christos
Date: Fri Jan 6 17:22:51 UTC 2017
Modified Files:
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile
Log Message:
don't run grep if we don't have the Makefile, like when we are building
objdirs
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/dbsym/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.9 src/tools/dbsym/Makefile:1.10
--- src/tools/dbsym/Makefile:1.9 Mon Feb 1 09:18:16 2016
+++ src/tools/dbsym/Makefile Fri Jan 6 12:22:51 2017
@@ -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 @@ IBERTYDIR= ${TOOLCHAINOBJ}/build/libiber
.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
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.11 src/tools/mdsetimage/Makefile:1.12
--- src/tools/mdsetimage/Makefile:1.11 Mon Feb 1 09:17:21 2016
+++ src/tools/mdsetimage/Makefile Fri Jan 6 12:22:51 2017
@@ -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 @@ IBERTYDIR= ${TOOLCHAINOBJ}/build/libiber
.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
