Index: devel/llvm-devel/Makefile
===================================================================
--- devel/llvm-devel/Makefile
+++ devel/llvm-devel/Makefile
@@ -89,10 +89,10 @@
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm-devel.mk
 CLANG_SUB_FILES=	xtoolchain.mk
-CLANG_SUB_LIST=		XCC=clang${XCC} \
-			XCXX=clang++${XCXX} \
-			XCPP=clang-cpp${XCPP} \
-			XLD=${LLVM_PREFIX}/bin/ld.lld \
+CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
+			XCXX=clang++${LLVM_SUFFIX} \
+			XCPP=clang-cpp${LLVM_SUFFIX} \
+			XLD=ld.lld${LLVM_SUFFIX} \
 			X_COMPILER_TYPE=clang
 CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
Index: devel/llvm-devel/files/xtoolchain.mk.in
===================================================================
--- devel/llvm-devel/files/xtoolchain.mk.in
+++ devel/llvm-devel/files/xtoolchain.mk.in
@@ -1,6 +1,6 @@
 XCC=%%LOCALBASE%%/bin/%%XCC%%
 XCXX=%%LOCALBASE%%/bin/%%XCXX%%
 XCPP=%%LOCALBASE%%/bin/%%XCPP%%
-XLD=%%XLD%%
+XLD=%%LOCALBASE%%/bin/%%XLD%%
 CROSS_BINUTILS_PREFIX=/var/empty
 X_COMPILER_TYPE=%%X_COMPILER_TYPE%%