From 0a0b746f3c7dba844884aa868e351e5a44abb8a8 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej>
Date: Fri, 10 Jan 2003 18:44:02 +0000
Subject: Don't add rpath statements to _BLNK_LDFLAGS if _USE_RPATH != "yes".

---
 mk/buildlink2/bsd.buildlink2.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index d7da8da26c0..640ba9f8ecb 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.74 2003/01/10 09:59:25 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.75 2003/01/10 18:44:02 thorpej Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -57,8 +57,10 @@ MAKE_ENV+=		BUILDLINK_DIR="${BUILDLINK_DIR}"
 CONFIGURE_ENV+=		BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}"
 MAKE_ENV+=		BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}"
 _BLNK_CPPFLAGS=		-I${LOCALBASE}/include
-_BLNK_LDFLAGS=		-L${LOCALBASE}/lib				\
-			-Wl,${_OPSYS_RPATH_NAME}${LOCALBASE}/lib
+_BLNK_LDFLAGS=		-L${LOCALBASE}/lib
+.if ${_USE_RPATH} == "yes"
+_BLNK_LDFLAGS+=		-Wl,${_OPSYS_RPATH_NAME}${LOCALBASE}/lib
+.endif
 _BLNK_OPSYS=		${OPSYS}
 
 BUILDLINK_SHELL?=	${SH}
@@ -93,7 +95,10 @@ BUILD_DEPENDS+=		x11-links>=0.10:../../pkgtools/x11-links
 _BLNK_X11_DIR=		${LOCALBASE}/share/x11-links
 .  endif
 _BLNK_CPPFLAGS+=	-I${X11BASE}/include
-_BLNK_LDFLAGS+=		-L${X11BASE}/lib -Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib
+_BLNK_LDFLAGS+=		-L${X11BASE}/lib
+.if ${_USE_RPATH} == "yes"
+_BLNK_LDFLAGS+=		-Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib
+.endif
 .endif
 
 CONFIGURE_ENV+=		BUILDLINK_CPPFLAGS="${_BLNK_CPPFLAGS}"
-- 
cgit v1.2.3