aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-12-21 18:37:45 +0800
committertobik <tobik@FreeBSD.org>2018-12-21 18:37:45 +0800
commit1cf2eef9d909f410c327a05f2d99e58c7d739112 (patch)
tree04c1d15e2a162e3afdb5b908586127ce787de595 /lang
parent7a49012806b2fcdcc5e554f50d79819f7ba4d040 (diff)
downloadfreebsd-ports-gnome-1cf2eef9d909f410c327a05f2d99e58c7d739112.tar.gz
freebsd-ports-gnome-1cf2eef9d909f410c327a05f2d99e58c7d739112.tar.zst
freebsd-ports-gnome-1cf2eef9d909f410c327a05f2d99e58c7d739112.zip
lang/rust-nightly: Unbreak after r487977
Diffstat (limited to 'lang')
-rw-r--r--lang/rust-nightly/Makefile22
1 files changed, 2 insertions, 20 deletions
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index f37703feb9c8..a18009c8fc4f 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -22,32 +22,14 @@ BOOTSTRAPS_DATE= 2018-12-09
RUST_BOOTSTRAP_VERSION= beta
CARGO_BOOTSTRAP_VERSION= beta
+CARGO_VENDOR_DIR= ${WRKSRC}/vendor
+
# Other bootstraps aren't provided by upstream yet
ONLY_FOR_ARCHS= amd64 i386
-# Same as lang/rust except for src/vendor/ -> vendor/
-CRATES_PATCHED_BY_FBSD10_FIX= vendor/libssh2-sys \
- vendor/lzma-sys
-
post-patch: nightly-post-patch
nightly-post-patch:
# Work around unused_unsafe errors in libcore with stage0
@${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs
-# Same as lang/rust except for src/vendor/ -> vendor/
-pre-configure:
- @for file in \
- ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
- ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
- mv "$$file" "$$file.dont-fix"; \
- done
-
-# Same as lang/rust except for src/vendor/ -> vendor/
-post-configure:
- @for file in \
- ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
- ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
- mv "$$file.dont-fix" "$$file"; \
- done
-
.include "${MASTERDIR}/Makefile"