pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: fix build on Darwin
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Wed Jun 18 09:30:23 2025 +0200
Changeset: 78bf295ed0b0f01a92052f07b185eb05598861f9
Modified Files:
rust187/Makefile
Log Message:
rust: fix build on Darwin
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78bf295ed0b0f01a92052f07b185eb05598861f9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust187/Makefile | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diffs:
diff --git a/rust187/Makefile b/rust187/Makefile
index f515801bc1..a0e963ab75 100644
--- a/rust187/Makefile
+++ b/rust187/Makefile
@@ -104,8 +104,8 @@ PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
# bootstrap compiler arguments and the stage1 libraries cannot be found.
# Ideally this should be inserted only in the necessary points of the
# bootstrap script.
-.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
-MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/build/aarch64-apple-darwin/stage1/lib
+.if ${OPSYS} == "Darwin"
+MAKE_ENV+= DYLD_LIBRARY_PATH="${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage1/lib:${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage2/lib"
.endif
# Allow overriding MAKE_JOBS_SAFE
@@ -601,10 +601,6 @@ do-test:
${SETENV} ${MAKE_ENV} \
${TOOL_PYTHONBIN} ./x.py test -j ${_MAKE_JOBS_N}
-OPSYSVARS+= SOEXT
-SOEXT.Darwin= dylib
-SOEXT.*= so
-
do-install:
${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC} && \
@@ -612,7 +608,7 @@ do-install:
${TOOL_PYTHONBIN} ./x.py install -j ${_MAKE_JOBS_N}
.if ${OPSYS} == "Darwin"
cd ${DESTDIR}${PREFIX}/lib && \
- for lib in rustlib/*/lib/libstd-*.${SOEXT}; do \
+ for lib in rustlib/*/lib/libstd-*.${SHLIB_EXT}; do \
${LN} -f $${lib} $${lib##*/}; \
done
.endif
Home |
Main Index |
Thread Index |
Old Index