Skip to content

Commit dd9f0e2

Browse files
committed
rust184: remove use of patchelf, as suggested by riastradh@
This is remnants of a misguided attempt at dealing with rust-lang/rust#133629 which was triggered by running the stage1 rust compiler from within the build tree. Ref. also https://mail-index.netbsd.org/pkgsrc-changes/2025/04/02/msg320497.html
1 parent 179c4a6 commit dd9f0e2

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

rust184/Makefile

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ CHECK_SSP_SUPPORTED= no
9191

9292
.include "../../mk/bsd.prefs.mk"
9393

94-
.if ${OPSYS} == "NetBSD"
95-
TOOL_DEPENDS+= patchelf-[0-9]*:../../devel/patchelf
96-
FORCE_RPATH= --force-rpath
97-
.endif
98-
9994
# Allow overriding MAKE_JOBS_SAFE
10095
# some may chose to mostly build faster,
10196
# and deal with any failures due to deadlocks
@@ -581,30 +576,11 @@ do-test:
581576
${SETENV} ${MAKE_ENV} \
582577
${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
583578

584-
PATCH_BINARIES+= bin/cargo
585-
PATCH_BINARIES+= bin/cargo-clippy
586-
PATCH_BINARIES+= bin/clippy-driver
587-
PATCH_BINARIES+= bin/rust-analyzer
588-
PATCH_BINARIES+= bin/rustc
589-
PATCH_BINARIES+= bin/rustdoc
590-
PATCH_BINARIES+= bin/rustfmt
591-
PATCH_BINARIES+= libexec/rust-analyzer-proc-macro-srv
592-
593579
do-install:
594580
${RUN}${_ULIMIT_CMD} \
595581
cd ${WRKSRC} && \
596582
${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
597583
${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
598-
.if ${OPSYS} == "NetBSD"
599-
for bin in ${PATCH_BINARIES}; do \
600-
f=${DESTDIR}${PREFIX}/$${bin}; \
601-
if [ -f $$f ]; then \
602-
cmd="${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f"; \
603-
echo $$cmd; \
604-
$$cmd; \
605-
fi; \
606-
done
607-
.endif
608584

609585
SUBST_CLASSES+= destdir
610586
SUBST_STAGE.destdir= post-install

0 commit comments

Comments
 (0)