summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2018-04-20 11:31:43 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2018-04-20 11:38:16 +0200
commit29b4fe504cfd425b45bbba8d76f460f48c6b64d6 (patch)
tree712fe223386376a392115620fd8cb53971897b46
parent3b228c5ae0587a2315b9eee0c6f9e697ad626fac (diff)
downloadrust-master.tar.gz
rust-master.tar.xz
rust: apply Cargo.lock patch before fetching depsHEADmaster
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-lang/rust/rust-1.25.0.exheres-01
-rw-r--r--packages/dev-lang/rust/rust-build.exlib3
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/dev-lang/rust/rust-1.25.0.exheres-0 b/packages/dev-lang/rust/rust-1.25.0.exheres-0
index d7bf0ac..35f0f55 100644
--- a/packages/dev-lang/rust/rust-1.25.0.exheres-0
+++ b/packages/dev-lang/rust/rust-1.25.0.exheres-0
@@ -11,5 +11,4 @@ DOWNLOADS="https://static.rust-lang.org/dist/${MY_PNV}.tar.xz"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/0001-make-codegen-backends-directory-name-configurable.patch
- "${FILES}"/0001-update-cc.patch
)
diff --git a/packages/dev-lang/rust/rust-build.exlib b/packages/dev-lang/rust/rust-build.exlib
index 8596507..fe5a602 100644
--- a/packages/dev-lang/rust/rust-build.exlib
+++ b/packages/dev-lang/rust/rust-build.exlib
@@ -138,6 +138,9 @@ rust-build_src_unpack() {
default
fi
+ edo cd "${WORK}"
+ ever at_least 1.26 || edo patch -p1 < "${FILES}"/0001-update-cc.patch
+
edo cd "${WORK}"/src
ecargo_fetch
}