mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

lang/rust: unbreak non-poudriere build after r412305

Browse Source 
gmake[1]: Leaving directory '/wrkdirs/usr/ports/lang/rust/work/rustc-1.7.0'
sed: /wrkdirs/usr/ports/lang/rust/work/stage/usr/local/lib/rustlib/manifest-rust-std-x86_64-unknown-: No such file or directory
*** Error code 1

PR:		208527
Pointy hat:	jbeich
Tested by:	Marko Cupać <marko.cupac@mimar.rs>, pilot513@gmail.com
Approved by:	riggs (maintainer)
MFH:		2016Q2
This commit is contained in:
Jan Beich 2016-04-07 07:17:45 +00:00
parent 79ab7dd66f
commit 811236773d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=412657
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lang/rust/Makefile
View File

@ -125,13 +125,13 @@ post-patch:
# new ones. Otherwise, the staging directory is polluted with unneeded
# files.
pre-install:
.for f in manifest-rustc manifest-rust-std-${RUST_TARGET}
@if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/${f}; then \
@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
< ${STAGEDIR}${PREFIX}/lib/rustlib/${f} \
< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
| ${XARGS} ${RM}; \
fi
.endfor
fi; \
done
@${RM} \
${STAGEDIR}${PREFIX}/lib/rustlib/components \
${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
@ -140,11 +140,11 @@ pre-install:
${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
post-install:
.for f in manifest-rustc manifest-rust-std-${RUST_TARGET}
@${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
${STAGEDIR}${PREFIX}/lib/rustlib/${f}
@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/${f}.bak
.endfor
@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
done
@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
# but they contain non-object files which make strip(1) unhappy.