diff options
Diffstat (limited to 'lang/rust')
| -rw-r--r-- | lang/rust/Makefile | 24 | ||||
| -rw-r--r-- | lang/rust/distinfo | 102 | ||||
| -rw-r--r-- | lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c | 5 | ||||
| -rw-r--r-- | lang/rust/update.sh | 4 |
4 files changed, 72 insertions, 63 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 586ce27dd5ca..ed549b63d685 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,5 +1,5 @@ PORTNAME= rust -PORTVERSION?= 1.91.1 +PORTVERSION?= 1.92.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -47,7 +47,7 @@ CONFLICTS_INSTALL?= rust-nightly rust188 TMPDIR?= ${WRKDIR} OPTIONS_DEFINE= DOCS GDB LTO PORT_LLVM SOURCES WASM -OPTIONS_DEFAULT= DOCS SOURCES +OPTIONS_DEFAULT= DOCS SOURCES WASM OPTIONS_DEFINE_i386= SSE2 OPTIONS_DEFAULT_i386= SSE2 @@ -63,17 +63,18 @@ DOCS_VARS= _RUST_BUILD_DOCS=true \ _COMPONENTS+="rust-docs-${_PACKAGE_VERS}-${_RUST_TARGET} rust-docs-json-${_PACKAGE_VERS}-${_RUST_TARGET}" DOCS_VARS_OFF= _RUST_BUILD_DOCS=false GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb -PORT_LLVM_USES= llvm:min=19,lib,noexport +PORT_LLVM_USES= llvm:min=${LLVM_VERSION},lib,noexport PORT_LLVM_MAKE_ENV= RUSTFLAGS="-Lnative=${LOCALBASE}/lib" -WASM_USES= llvm:min=19,lib,noexport SOURCES_VARS= _COMPONENTS+=rust-src-${_PACKAGE_VERS} \ _RUST_TOOLS+=src WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-std-${_PACKAGE_VERS}-wasm32-unknown-unknown" \ _RUST_TARGETS+=wasm32-unknown-unknown # See WRKSRC/src/stage0 for the date and version values -BOOTSTRAPS_DATE?= 2025-09-18 -RUST_BOOTSTRAP_VERSION?= 1.90.0 +BOOTSTRAPS_DATE?= 2025-10-30 +RUST_BOOTSTRAP_VERSION?= 1.91.0 + +LLVM_VERSION= 20 CARGO_VENDOR_DIR?= ${WRKSRC}/vendor @@ -199,6 +200,9 @@ do-configure: @${ECHO_CMD} 'remap-debuginfo=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'download-ci-llvm=false' >> ${WRKSRC}/config.toml +.if ${PORT_OPTIONS:MWASM} + @${ECHO_CMD} 'clang=true' >> ${WRKSRC}/config.toml +.endif .if ${PORT_OPTIONS:MLTO} @${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml .endif @@ -220,11 +224,11 @@ do-configure: @${ECHO_CMD} 'cxx="${WRKDIR}/cxx-wrapper"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml .else -# base clang doesn't support wasm32-unknown-unknown, use llvm from ports +# use the builtin clang .if ${_target} == "wasm32-unknown-unknown" - @${ECHO_CMD} 'cc="${LOCALBASE}/bin/clang${LLVM_VERSION}"' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'cxx="${LOCALBASE}/bin/clang++${LLVM_VERSION}"' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'linker="${LOCALBASE}/bin/clang${LLVM_VERSION}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cc="${WRKDIR}/_build/${_RUST_TARGET}/llvm/bin/clang"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cxx="${WRKDIR}/_build/${_RUST_TARGET}/llvm/bin/clang++"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'linker="${WRKDIR}/_build/${_RUST_TARGET}/llvm/bin/clang"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 5d30b20178ea..d8b63ce1eae7 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1762850628 -SHA256 (rust/rustc-1.91.1-src.tar.xz) = 66401bb815e236cc6b2aacbbe23b61b286c1fe27a67902e7c0222cfe77b3dbab -SIZE (rust/rustc-1.91.1-src.tar.xz) = 270957016 -SHA256 (rust/2025-09-18/rustc-1.90.0-aarch64-unknown-freebsd.tar.xz) = a2309a06485b18ba8fa7d2bc70363b5d0e609dfa229c08d174e0dda1df7f7c6c -SIZE (rust/2025-09-18/rustc-1.90.0-aarch64-unknown-freebsd.tar.xz) = 51922812 -SHA256 (rust/2025-09-18/rust-std-1.90.0-aarch64-unknown-freebsd.tar.xz) = d4886646c149e6c1947af9af086a27dac4bb91ae3a6732ddc8a4ecf7a89d0031 -SIZE (rust/2025-09-18/rust-std-1.90.0-aarch64-unknown-freebsd.tar.xz) = 25737340 -SHA256 (rust/2025-09-18/cargo-1.90.0-aarch64-unknown-freebsd.tar.xz) = 24a32547e1416ebf8d4dc52695150ec314b3aad990ab8983770a59ca1e1da78a -SIZE (rust/2025-09-18/cargo-1.90.0-aarch64-unknown-freebsd.tar.xz) = 9662808 -SHA256 (rust/2025-09-18/rustc-1.90.0-x86_64-unknown-freebsd.tar.xz) = 28bc004ab6841693ffc02f19a9f9da120a275cdde916a2e9e28437960a0d95c7 -SIZE (rust/2025-09-18/rustc-1.90.0-x86_64-unknown-freebsd.tar.xz) = 47615700 -SHA256 (rust/2025-09-18/rust-std-1.90.0-x86_64-unknown-freebsd.tar.xz) = 3115acf7d011067afd9b899b251e90d125190f4c664747eb1eafa6b36881c036 -SIZE (rust/2025-09-18/rust-std-1.90.0-x86_64-unknown-freebsd.tar.xz) = 26727916 -SHA256 (rust/2025-09-18/cargo-1.90.0-x86_64-unknown-freebsd.tar.xz) = 21c4ab33cebadcb0c81c3bd91aacb0d5851d1a34e7032c3190ffd939ac823880 -SIZE (rust/2025-09-18/cargo-1.90.0-x86_64-unknown-freebsd.tar.xz) = 10981908 -SHA256 (rust/2025-09-18/rustc-1.90.0-armv7-unknown-freebsd.tar.xz) = 6677b3e02c017f5661342dea089f002f39a7646c3092e429daac49c6db5b3c5c -SIZE (rust/2025-09-18/rustc-1.90.0-armv7-unknown-freebsd.tar.xz) = 51933284 -SHA256 (rust/2025-09-18/rust-std-1.90.0-armv7-unknown-freebsd.tar.xz) = db33d92e16acc889339c9119aa405a483667dac8c0767fa7f8d037cbe3cebac8 -SIZE (rust/2025-09-18/rust-std-1.90.0-armv7-unknown-freebsd.tar.xz) = 24912324 -SHA256 (rust/2025-09-18/cargo-1.90.0-armv7-unknown-freebsd.tar.xz) = 9231f46b590579a0780c4e9ca07e4e3039dacb10fe07ded148d819c72bfe68d8 -SIZE (rust/2025-09-18/cargo-1.90.0-armv7-unknown-freebsd.tar.xz) = 9999704 -SHA256 (rust/2025-09-18/rustc-1.90.0-i686-unknown-freebsd.tar.xz) = ae4fb58e00e2996cf11390eb17096300c04ac0ca6ba7168688e70275de915e54 -SIZE (rust/2025-09-18/rustc-1.90.0-i686-unknown-freebsd.tar.xz) = 59013056 -SHA256 (rust/2025-09-18/rust-std-1.90.0-i686-unknown-freebsd.tar.xz) = ff18a19226ffca459a2d1fbd029ed022e048d6c80bffcb8bf0e7b2e181045d96 -SIZE (rust/2025-09-18/rust-std-1.90.0-i686-unknown-freebsd.tar.xz) = 26528240 -SHA256 (rust/2025-09-18/cargo-1.90.0-i686-unknown-freebsd.tar.xz) = b26dc3676ab36893a95e3b544acdf40b8fbb51fed589d8e4197adcaafb618aa4 -SIZE (rust/2025-09-18/cargo-1.90.0-i686-unknown-freebsd.tar.xz) = 11624984 -SHA256 (rust/2025-09-18/rustc-1.90.0-powerpc-unknown-freebsd.tar.xz) = a0c7255137ce84c9ab0ebb94d9dd35e53eca412cffd0f155298b83da91ecc890 -SIZE (rust/2025-09-18/rustc-1.90.0-powerpc-unknown-freebsd.tar.xz) = 52852384 -SHA256 (rust/2025-09-18/rust-std-1.90.0-powerpc-unknown-freebsd.tar.xz) = 6e4cb4a1ff7a1ee63f5b57ee22daa297137ac2e08bb7ac3163702f49ce661be8 -SIZE (rust/2025-09-18/rust-std-1.90.0-powerpc-unknown-freebsd.tar.xz) = 23820420 -SHA256 (rust/2025-09-18/cargo-1.90.0-powerpc-unknown-freebsd.tar.xz) = ac58aa3c7f4d18ad6f2bc3420aae0ce3abab3fc52f6f838c0129e664933ae05e -SIZE (rust/2025-09-18/cargo-1.90.0-powerpc-unknown-freebsd.tar.xz) = 10065824 -SHA256 (rust/2025-09-18/rustc-1.90.0-powerpc64-unknown-freebsd.tar.xz) = d1357bd141a8f68655a12056059e4bd1c6af8c8420ba579bf9908793ba8936ed -SIZE (rust/2025-09-18/rustc-1.90.0-powerpc64-unknown-freebsd.tar.xz) = 52207452 -SHA256 (rust/2025-09-18/rust-std-1.90.0-powerpc64-unknown-freebsd.tar.xz) = 78095956c2bc08177dc6c38b096faf64fddf8d70526c491bada7ea7c934badcc -SIZE (rust/2025-09-18/rust-std-1.90.0-powerpc64-unknown-freebsd.tar.xz) = 23804160 -SHA256 (rust/2025-09-18/cargo-1.90.0-powerpc64-unknown-freebsd.tar.xz) = 9fa65616166d8534b5438441cc6eeb319be2581173389bf0f7fcdd11b3df0ea4 -SIZE (rust/2025-09-18/cargo-1.90.0-powerpc64-unknown-freebsd.tar.xz) = 10181856 -SHA256 (rust/2025-09-18/rustc-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 5bfe9c7c224420c647c23855379887c425834a51b521197dbf7232d7311aa618 -SIZE (rust/2025-09-18/rustc-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 54859868 -SHA256 (rust/2025-09-18/rust-std-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 3df7248efbb7d1768015435324acd48ac998ced0b11c83a9923ddb8cfbf1bc96 -SIZE (rust/2025-09-18/rust-std-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 23930892 -SHA256 (rust/2025-09-18/cargo-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 7d9d0c5fe1d438731a13578cbce021d37618b575ba5e866bcf8a7141c99d5682 -SIZE (rust/2025-09-18/cargo-1.90.0-powerpc64le-unknown-freebsd.tar.xz) = 10758944 -SHA256 (rust/2025-09-18/rustc-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 9fe439641e95be416c0e43226a69a0665fa2349ce39390a30f98ff3707365c53 -SIZE (rust/2025-09-18/rustc-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 60870560 -SHA256 (rust/2025-09-18/rust-std-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 9e65e2bb709a5d6b07f7643ae909352948913bb907304c47b29a9ff45d02a421 -SIZE (rust/2025-09-18/rust-std-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 24241224 -SHA256 (rust/2025-09-18/cargo-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 872cd083f7a4a4a622084a6d6cfb36d3acd28a381df8c705a284bbc055ab73f4 -SIZE (rust/2025-09-18/cargo-1.90.0-riscv64gc-unknown-freebsd.tar.xz) = 12337788 +TIMESTAMP = 1765474849 +SHA256 (rust/rustc-1.92.0-src.tar.xz) = ebee170bfe4c4dfc59521a101de651e5534f4dae889756a5c97ca9ea40d0c307 +SIZE (rust/rustc-1.92.0-src.tar.xz) = 271887480 +SHA256 (rust/2025-10-30/rustc-1.91.0-aarch64-unknown-freebsd.tar.xz) = 946db4b860a40d9b6d2f15e5c231b9597434386d39163578ee4b8536559e712d +SIZE (rust/2025-10-30/rustc-1.91.0-aarch64-unknown-freebsd.tar.xz) = 47360928 +SHA256 (rust/2025-10-30/rust-std-1.91.0-aarch64-unknown-freebsd.tar.xz) = f8b9b968ff654ce70dcc292dac12ec6f4e00501a86940efe909f9b2fd697f1ce +SIZE (rust/2025-10-30/rust-std-1.91.0-aarch64-unknown-freebsd.tar.xz) = 25988344 +SHA256 (rust/2025-10-30/cargo-1.91.0-aarch64-unknown-freebsd.tar.xz) = f0442359be7553bd89d4a19ef6903d0f57bb846b033cd98637802a6d4a4c7432 +SIZE (rust/2025-10-30/cargo-1.91.0-aarch64-unknown-freebsd.tar.xz) = 9626636 +SHA256 (rust/2025-10-30/rustc-1.91.0-x86_64-unknown-freebsd.tar.xz) = daa260b609db12828c2d2f99b81207dff895807952d1244e780f3c3018a85066 +SIZE (rust/2025-10-30/rustc-1.91.0-x86_64-unknown-freebsd.tar.xz) = 42053952 +SHA256 (rust/2025-10-30/rust-std-1.91.0-x86_64-unknown-freebsd.tar.xz) = cd93396b4dbd9c6480ad1de1d48079e9bf76e520b0496e0ed591106150cb1ea7 +SIZE (rust/2025-10-30/rust-std-1.91.0-x86_64-unknown-freebsd.tar.xz) = 27159360 +SHA256 (rust/2025-10-30/cargo-1.91.0-x86_64-unknown-freebsd.tar.xz) = af3988a1097c587b841cfa444baf57603775b59b7f5d4d9e85054e6566b3b032 +SIZE (rust/2025-10-30/cargo-1.91.0-x86_64-unknown-freebsd.tar.xz) = 10945760 +SHA256 (rust/2025-10-30/rustc-1.91.0-armv7-unknown-freebsd.tar.xz) = e42eeaf310db04ee8a2f57117b83ed59b7bc4a26559495e0589cce2ed55254e1 +SIZE (rust/2025-10-30/rustc-1.91.0-armv7-unknown-freebsd.tar.xz) = 46938728 +SHA256 (rust/2025-10-30/rust-std-1.91.0-armv7-unknown-freebsd.tar.xz) = bfd9c03213442fdc108510bacfcfec802a2be9a964aa6969158cd8f98d6ba565 +SIZE (rust/2025-10-30/rust-std-1.91.0-armv7-unknown-freebsd.tar.xz) = 25152504 +SHA256 (rust/2025-10-30/cargo-1.91.0-armv7-unknown-freebsd.tar.xz) = 11f2584b8da7b9952c6280c1cfd185d8230ae71767fd6aa7538b4ad7da7f3e03 +SIZE (rust/2025-10-30/cargo-1.91.0-armv7-unknown-freebsd.tar.xz) = 9971560 +SHA256 (rust/2025-10-30/rustc-1.91.0-i686-unknown-freebsd.tar.xz) = df4a5a7a47f969ed157f3f9a24f02c5a8a4b0cea4516f1e1c9b9757705d0d339 +SIZE (rust/2025-10-30/rustc-1.91.0-i686-unknown-freebsd.tar.xz) = 53403816 +SHA256 (rust/2025-10-30/rust-std-1.91.0-i686-unknown-freebsd.tar.xz) = 543ca3ad97cdd19136a52c72f58eaa1ac593c463bdb18587b8bd2ade042652b8 +SIZE (rust/2025-10-30/rust-std-1.91.0-i686-unknown-freebsd.tar.xz) = 26935888 +SHA256 (rust/2025-10-30/cargo-1.91.0-i686-unknown-freebsd.tar.xz) = 15b69d38f14ea9480e1c77d6fc1fadbc844983341a570fe092131b0dae530826 +SIZE (rust/2025-10-30/cargo-1.91.0-i686-unknown-freebsd.tar.xz) = 11614152 +SHA256 (rust/2025-10-30/rustc-1.91.0-powerpc-unknown-freebsd.tar.xz) = 58b0ff45452b1701592d23175b9f610d2abc145ecc99c1e0e951e73a5e249263 +SIZE (rust/2025-10-30/rustc-1.91.0-powerpc-unknown-freebsd.tar.xz) = 48532364 +SHA256 (rust/2025-10-30/rust-std-1.91.0-powerpc-unknown-freebsd.tar.xz) = 9562cbaf66d05a5d615aab66dd4e0525f34a8a5eb5077b2ca35366873641eddc +SIZE (rust/2025-10-30/rust-std-1.91.0-powerpc-unknown-freebsd.tar.xz) = 24124292 +SHA256 (rust/2025-10-30/cargo-1.91.0-powerpc-unknown-freebsd.tar.xz) = 170b40336145a18d474933fcfb809fa05da2d48136559e904d5d841086998277 +SIZE (rust/2025-10-30/cargo-1.91.0-powerpc-unknown-freebsd.tar.xz) = 9992512 +SHA256 (rust/2025-10-30/rustc-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 03f1219b58ef016bc6fd4915a7ece2b966273d0e247b056a2145b7487a22027f +SIZE (rust/2025-10-30/rustc-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 47521324 +SHA256 (rust/2025-10-30/rust-std-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 5d1099d69af25df77a678ec423a987169b9fbb0a80b9d453c4b2fb66f00df358 +SIZE (rust/2025-10-30/rust-std-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 24196000 +SHA256 (rust/2025-10-30/cargo-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 20008aa1efdf8aa4c3e39918f0766253de05d07f147e914cb2b31defb512699c +SIZE (rust/2025-10-30/cargo-1.91.0-powerpc64-unknown-freebsd.tar.xz) = 10123592 +SHA256 (rust/2025-10-30/rustc-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = a8f130067e2a5a5ca3ff7f276b14db19f78b0ed7b1c2a603cea2d8d02cf778b4 +SIZE (rust/2025-10-30/rustc-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = 49858584 +SHA256 (rust/2025-10-30/rust-std-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = 81bbcc7bdc0cc4a563d1b1394bdcc2b150bed9502ea932a20d253b52a60e1a15 +SIZE (rust/2025-10-30/rust-std-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = 24302800 +SHA256 (rust/2025-10-30/cargo-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = 6ba296d82344a4c9b6f675e19120f249c619f8d7fea98f6a12d52c8db0add6ce +SIZE (rust/2025-10-30/cargo-1.91.0-powerpc64le-unknown-freebsd.tar.xz) = 10717884 +SHA256 (rust/2025-10-30/rustc-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = b558baeeb01ed5d231f07176f3f605ad8a05c5fb9375ffae34afaa70a44a9f27 +SIZE (rust/2025-10-30/rustc-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = 50945880 +SHA256 (rust/2025-10-30/rust-std-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = 2e8b6dc2ffa670e3b993d524854f94834d0956081357a063212ec22a2d0a80cb +SIZE (rust/2025-10-30/rust-std-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = 24484592 +SHA256 (rust/2025-10-30/cargo-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = c837db0903847e3ab25d3b72d31b24692a7234f230244dd7e600bf6394b46a17 +SIZE (rust/2025-10-30/cargo-1.91.0-riscv64gc-unknown-freebsd.tar.xz) = 10734680 diff --git a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c index e8ade04d557a..8dc2e29526ef 100644 --- a/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c +++ b/lang/rust/files/patch-vendor_openssl_crypto_threads__pthread.c @@ -13,8 +13,9 @@ #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS) # if defined(OPENSSL_SYS_UNIX) ---- vendor/openssl-src-300.5.2+3.5.2/openssl/crypto/threads_pthread.c.orig 2025-05-09 22:37:37.000000000 +0200 -+++ vendor/openssl-src-300.5.2+3.5.2/openssl/crypto/threads_pthread.c 2025-05-21 14:44:18.563852000 +0200 + +--- vendor/openssl-src-300.5.3+3.5.4/openssl/crypto/threads_pthread.c.orig 2025-05-09 22:37:37.000000000 +0200 ++++ vendor/openssl-src-300.5.3+3.5.4/openssl/crypto/threads_pthread.c 2025-05-21 14:44:18.563852000 +0200 @@ -50,6 +50,10 @@ __tsan_mutex_post_lock((x), 0, 0) # define BROKEN_CLANG_ATOMICS #endif diff --git a/lang/rust/update.sh b/lang/rust/update.sh index f169891c53d7..befc8cbde9e9 100644 --- a/lang/rust/update.sh +++ b/lang/rust/update.sh @@ -14,6 +14,10 @@ RUST_BOOTSTRAP_VERSION=$(awk -F "=" /^compiler_version/'{print $2}' /tmp/stage0) echo "BOOTSTRAPS_DATE=${BOOTSTRAPS_DATE}" | portedit merge -i . echo "RUST_BOOTSTRAP_VERSION=${RUST_BOOTSTRAP_VERSION}" | portedit merge -i . +fetch -qo /tmp/llvm.rs https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/bootstrap/src/core/build_steps/llvm.rs +LLVM_VERSION=$(grep "bad LLVM version" /tmp/llvm.rs | sed "s/[^0-9]//g") +echo "LLVM_VERSION=${LLVM_VERSION}" | portedit merge -i . + cat <<EOF | sed -i '' -E -f - ../../Mk/Uses/cargo.mk ../../Mk/bsd.gecko.mk 1,/\\$\\{RUST_DEFAULT\\}>=/ { s,(\\$\\{RUST_DEFAULT\\}>=).*(:lang/\\$\\{RUST_DEFAULT\\}),\\1${version}\\2, |