Module Name: src
Committed By: matt
Date: Thu Feb 10 21:55:34 UTC 2011
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Only define DPLIBC if LIBC_SO is not empty otherwise we an errant
dependency on DESTDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 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.311 src/share/mk/bsd.lib.mk:1.312
--- src/share/mk/bsd.lib.mk:1.311 Sun Feb 6 00:52:49 2011
+++ src/share/mk/bsd.lib.mk Thu Feb 10 21:55:33 2011
@@ -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"
