summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordanw <danw@pkgsrc.org>2003-09-25 02:25:12 +0000
committerdanw <danw@pkgsrc.org>2003-09-25 02:25:12 +0000
commita191a12a243f8bbe2438962cec732befd009a6b2 (patch)
tree17d10112bed1042a7175bde65d94a496af65e762 /mk
parente8c72c625e2fbeda93caec71b21498ec53597909 (diff)
downloadpkgsrc-a191a12a243f8bbe2438962cec732befd009a6b2.tar.gz
don't put ${RPATH_FLAG} in X11_LDFLAGS if _USE_RPATH==no (darwin)
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a1eb3215b08..e160a6f2a55 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1289 2003/09/24 12:22:03 grant Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1290 2003/09/25 02:25:12 danw Exp $
#
# This file is in the public domain.
#
@@ -394,7 +394,9 @@ DISTINFO_FILE?= ${.CURDIR}/distinfo
FIX_RPATH+= LIBS
.if defined(USE_X11)
X11_LDFLAGS= # empty
+. if empty(_USE_RPATH:M[nN][oO])
X11_LDFLAGS+= -Wl,${RPATH_FLAG}${X11BASE}/lib
+. endif
X11_LDFLAGS+= -L${X11BASE}/lib
.endif
.if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])