@@ -183,14 +183,14 @@ SITES.${DF}= ${NETBSD_REPO}
183183.endif
184184
185185# Illumos:
186- # .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mdi)
187- # RUST_ARCH:= x86_64-unknown-illumos
188- # DN:= ${DISTNAME}
189- # EXTRACT_SUFX= .tar.gz
190- # DF:= ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
191- # DISTFILES:= ${DISTFILES} ${DF}
192- # SITES.${DF}= https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
193- # .endif
186+ .if !empty(MACHINE_PLATFORM :MSunOS-* -x86_64) || make(distinfo) || make(makesum) || make(mdi)
187+ RUST_ARCH: = x86_64-unknown-illumos
188+ DN: = ${DISTNAME}
189+ EXTRACT_SUFX = .tar.gz
190+ DF: = ${DN}-${RUST_ARCH}${EXTRACT_SUFX}
191+ DISTFILES: = ${DISTFILES} ${DF}
192+ SITES.${DF} = https://us-central.manta.mnx.io/pkgsrc/public/pkg-bootstraps/
193+ .endif
194194
195195
196196# Binary still extracts to plain non-nb'ed directory
@@ -210,14 +210,22 @@ do-install:
210210.PHONY : fix-darwin-install-name
211211post-install : fix-darwin-install-name
212212fix-darwin-install-name :
213- . for bin in clippy-driver miri rls rust-analyzer rustc rustdoc
213+ . for bin in cargo- clippy clippy -driver miri rls rust-analyzer rustc rustdoc rustfmt
214214 otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
215215 | ${GREP} '@rpath' | while read rpath rest; do \
216216 install_name_tool -change $$rpath \
217217 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
218218 ${DESTDIR}${PREFIX}/bin/${bin}; \
219219 done
220220. endfor
221+ . for libexec in rust-analyzer-proc-macro-srv
222+ otool -XL ${DESTDIR}${PREFIX}/libexec/${libexec} \
223+ | ${GREP} '@rpath' | while read rpath rest; do \
224+ install_name_tool -change $$rpath \
225+ `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
226+ ${DESTDIR}${PREFIX}/libexec/${libexec}; \
227+ done
228+ . endfor
221229. for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \
222230 llvm-profdata llvm-readobj llvm-size llvm-strip
223231 otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
0 commit comments