diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2018-01-06 07:28:16 +0800 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2018-01-06 07:28:16 +0800 |
| commit | 94fa51c3169eccc2ced0b14f52dfe3c9f98b2a81 (patch) | |
| tree | 56748a7bb2acf83df25915f09f544d663edc31f6 /lang | |
| parent | 1ec4d5f1bd27e3226ffa7703ad9e93810e349f55 (diff) | |
| download | freebsd-ports-gnome-94fa51c3169eccc2ced0b14f52dfe3c9f98b2a81.tar.gz freebsd-ports-gnome-94fa51c3169eccc2ced0b14f52dfe3c9f98b2a81.tar.zst freebsd-ports-gnome-94fa51c3169eccc2ced0b14f52dfe3c9f98b2a81.zip | |
lang/rust: Always replace bootstrap versions in `stage0.txt`
This simplifies the `Makefile`. The condition was fragile anyway because
it was based solely on the Makefile and not the actual content of
`stage0.txt`.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/Makefile | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 230566959824..51eaebdd1145 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -160,24 +160,15 @@ post-patch: # If we override the versions and date of the bootstraps (for instance # on aarch64 where we provide our own bootstraps), we need to update # places where they are recorded. - @if test "${BOOTSTRAPS_DATE_${ARCH}}" && \ - test "${BOOTSTRAPS_DATE_${ARCH}}" != "${BOOTSTRAPS_DATE}"; then \ - ${REINPLACE_CMD} -e \ + @${REINPLACE_CMD} -e \ 's|^date:.*|date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi - @if test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" && \ - test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" != "${RUST_BOOTSTRAP_VERSION}"; then \ - ${REINPLACE_CMD} -e \ + ${WRKSRC}/src/stage0.txt + @${REINPLACE_CMD} -e \ 's|^rustc:.*|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi - @if test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" && \ - test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" != "${CARGO_BOOTSTRAP_VERSION}"; then \ - ${REINPLACE_CMD} -e \ + ${WRKSRC}/src/stage0.txt + @${REINPLACE_CMD} -e \ 's|^cargo:.*|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi + ${WRKSRC}/src/stage0.txt # After patching crates, we need to update their corresponding # `.cargo-checksum.json` to reflect the new checksums verified by Cargo. @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \ |