Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,

which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

2 files changed, 12 insertions, 21 deletions

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 0c2b7b566df..e9540a9ec94 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.149 2004/08/13 03:43:23 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.150 2004/08/27 06:29:09 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -414,8 +414,8 @@ BUILDLINK_LDFLAGS+=	-L${_dir_}
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
 .      if exists(${_dir_})
-.        if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+.        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
@@ -427,8 +427,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
 #
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 .  if (${_USE_RPATH} == "yes") && \
-      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib)
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
+      empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${PREFIX}/lib)
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 .  endif
 .endif
 #
@@ -440,8 +440,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
 .      if exists(${_dir_})
-.        if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+.        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
@@ -451,8 +451,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
 # Ensure that ${LOCALBASE}/lib is in the runtime library search path.
 #
 .if (${_USE_RPATH} == "yes") && \
-    empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib)
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
+    empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${LOCALBASE}/lib)
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 .endif
 #
 # Add the X11 library directory to the library search paths if the package
@@ -463,8 +463,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
 BUILDLINK_LDFLAGS+=	-L${X11BASE}/lib${ABI}
 .  endif
 .  if (${_USE_RPATH} == "yes") && \
-      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI}
+      empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
 .  endif
 .endif
 
@@ -1619,8 +1619,6 @@ ${BUILDLINK_DIR}/bin/.libtool-fix-la:					\
 # Seed the common transforming cache with obvious values that greatly
 # speed up the wrappers.
 #
-_BLNK_RPATH_FLAGS=	${RPATH_FLAG}
-_BLNK_RPATH_FLAGS+=	-Wl,${RPATH_FLAG}
 .for _rflag_ in \
 	-Wl,-R -Wl,-rpath, -Wl,--rpath, -Wl,-rpath-link, -Wl,--rpath-link
 .  if empty(_BLNK_RPATH_FLAGS:M${_rflag_})
@@ -1748,8 +1746,6 @@ ${_BLNK_GEN_TRANSFORM}: ${.CURDIR}/../../mk/buildlink3/gen-transform.sh
 		-e "s|@_BLNK_TRANSFORM_SEDFILE@|${_BLNK_TRANSFORM_SEDFILE:Q}|g" \
 		-e "s|@_BLNK_UNTRANSFORM_SEDFILE@|${_BLNK_UNTRANSFORM_SEDFILE:Q}|g" \
 		-e "s|@_BLNK_REORDERLIBS@|${_BLNK_REORDERLIBS:Q}|g"	\
-		-e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG:Q}|g"     \
-		-e "s|@_OPSYS_RPATH_NAME@|${_OPSYS_RPATH_NAME:Q}|g"     \
 		-e "s|@BUILDLINK_SHELL@|${BUILDLINK_SHELL:Q}|g"         \
 		-e "s|@CAT@|${CAT:Q}|g"                                 \
 		${.ALLSRC} > ${.TARGET}.tmp
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index d0734b4ae7c..0de88add302 100644
--- a/mk/buildlink3/gen-transform.sh
+++ b/mk/buildlink3/gen-transform.sh
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.28 2004/08/10 15:13:25 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.29 2004/08/27 06:29:09 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -93,7 +93,6 @@ EOF
 		gen $action mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
 		gen $action mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
 		gen $action mangle:-Wl,-R$2:-Wl,-R$3
-		gen $action mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
 		gen $action mangle:-R$2:-R$3
 		;;
 	sub-rpath)
@@ -102,7 +101,6 @@ EOF
 		gen $action sub-mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
 		gen $action sub-mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
 		gen $action sub-mangle:-Wl,-R$2:-Wl,-R$3
-		gen $action sub-mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
 		gen $action sub-mangle:-R$2:-R$3
 		;;
 	abs-rpath)
@@ -111,7 +109,6 @@ EOF
 		gen $action __r:-Wl,-rpath-link,\\.
 		gen $action __r:-Wl,-rpath,\\.
 		gen $action __r:-Wl,-R\\.
-		gen $action __r:-Wl,@_OPSYS_RPATH_NAME@\\.
 		gen $action __r:-R\\.
 		;;
 	no-rpath)
@@ -120,7 +117,6 @@ EOF
 		gen $action __r:-Wl,-rpath-link,
 		gen $action __r:-Wl,-rpath,
 		gen $action __r:-Wl,-R
-		gen $action __r:-Wl,@_OPSYS_RPATH_NAME@
 		gen $action __r:-R
 		;;
 	reorder)
@@ -274,7 +270,6 @@ EOF
 		gen $action $r:-Wl,-rpath-link,$2
 		gen $action $r:-Wl,-rpath,$2
 		gen $action $r:-Wl,-R$2
-		gen $action $r:-Wl,@_OPSYS_RPATH_NAME@$2
 		gen $action $r:-R$2
 		;;
 	S)