Source-Changes-HG archive

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

[src/trunk]: src/share/mk Only define DPLIBC if LIBC_SO is not empty otherwis...



details:   https://anonhg.NetBSD.org/src/rev/0615890fb53d
branches:  trunk
changeset: 761926:0615890fb53d
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 10 21:55:33 2011 +0000

description:
Only define DPLIBC if LIBC_SO is not empty otherwise we an errant
dependency on DESTDIR.

diffstat:

 share/mk/bsd.lib.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r e54c82448553 -r 0615890fb53d share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Thu Feb 10 21:17:49 2011 +0000
+++ b/share/mk/bsd.lib.mk       Thu Feb 10 21:55:33 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.311 2011/02/06 00:52:49 joerg Exp $
+#      $NetBSD: bsd.lib.mk,v 1.312 2011/02/10 21:55:33 matt Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -536,10 +536,14 @@
 # -Xl,-nostdlib is not enough because we want to tell the compiler-driver not
 # to add standard libraries, not the linker.
 .if !defined(LIB)
+.if !empty(LIBC_SO)
 DPLIBC ?= ${DESTDIR}${LIBC_SO}
+.endif
 .else
 .if ${LIB} != "c" && ${LIB:Mgcc*} == ""
+.if !empty(LIBC_SO)
 DPLIBC ?= ${DESTDIR}${LIBC_SO}
+.endif
 .else
 LDLIBC ?= -nodefaultlibs
 .if ${LIB} == "c"



Home | Main Index | Thread Index | Old Index