diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 20 | ||||
| -rw-r--r-- | mk/xaw.buildlink2.mk | 3 |
2 files changed, 2 insertions, 21 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 0f81869d004..4846ff78de6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1315 2003/12/06 18:47:45 cube Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1316 2003/12/07 22:47:16 grant Exp $ # # This file is in the public domain. # @@ -410,12 +410,8 @@ SHCOMMENT?= ${ECHO_MSG} >/dev/null '***' 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]) @@ -425,7 +421,6 @@ LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= ${X11_LDFLAGS} . endif .endif -FIX_RPATH+= LDFLAGS MAKE_ENV+= LDFLAGS="${LDFLAGS}" MAKE_ENV+= RPATH_FLAG="${RPATH_FLAG}" MAKE_ENV+= WHOLE_ARCHIVE_FLAG="${WHOLE_ARCHIVE_FLAG}" @@ -869,19 +864,6 @@ RMAN?= ${X11BASE}/bin/rman . endif .endif -# FIX_RPATH will remove compiler or linker settings related to run-time -# library search path settings if _USE_RPATH is "no". -# -.if !empty(_USE_RPATH:M[nN][oO]) -. if defined(FIX_RPATH) && !empty(FIX_RPATH) -. for var in ${FIX_RPATH} -. for _rpath_flag in ${RPATH_FLAG} -R -rpath -rpath-link --rpath --rpath-link -${var}:= ${${var}:N-Wl,${_rpath_flag}*:N${_rpath_flag}*} -. endfor -. endfor -. endif -.endif - .if defined(EVAL_PREFIX) . for def in ${EVAL_PREFIX} . if !defined(${def:C/=.*//}_DEFAULT) diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk index 15b55c10609..8def1ff7187 100644 --- a/mk/xaw.buildlink2.mk +++ b/mk/xaw.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink2.mk,v 1.11 2003/11/11 00:48:44 danw Exp $ +# $NetBSD: xaw.buildlink2.mk,v 1.12 2003/12/07 22:47:16 grant Exp $ .if !defined(XAW_BUILDLINK2_MK) XAW_BUILDLINK2_MK= # defined @@ -22,7 +22,6 @@ BUILDLINK_PREFIX.Xaw?= ${X11BASE} LIBXAW?= -L${X11BASE}/lib${ABI} -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI} -lXaw .endif -FIX_RPATH+= LIBXAW MAKE_ENV+= LIBXAW="${LIBXAW}" .endif # XAW_BUILDLINK2_MK |