git: a802c571830f - main - lang/rust: privatise ${_LLVM_VERSION}
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 19 Dec 2025 17:16:34 UTC
The branch main has been updated by vishwin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a802c571830fc166c61fea2e957944127458cde4
commit a802c571830fc166c61fea2e957944127458cde4
Author: Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-12-19 17:14:39 +0000
Commit: Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-12-19 17:14:39 +0000
lang/rust: privatise ${_LLVM_VERSION}
Did not initially notice the added ${LLVM_VERSION} to denote minimum
required PORT_LLVM version, but privatise to avoid collision with
USES=llvm's ${LLVM_VERSION} logic.
---
lang/rust/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 278dd0445686..2843e9e1bc0c 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -63,7 +63,7 @@ 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=20,lib,noexport
+PORT_LLVM_USES= llvm:min=${_LLVM_VERSION},lib,noexport
PORT_LLVM_MAKE_ENV= RUSTFLAGS="-Lnative=${LOCALBASE}/lib"
SOURCES_VARS= _COMPONENTS+=rust-src-${_PACKAGE_VERS} \
_RUST_TOOLS+=src
@@ -74,7 +74,7 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
BOOTSTRAPS_DATE?= 2025-10-30
RUST_BOOTSTRAP_VERSION?= 1.91.0
-LLVM_VERSION= 20
+_LLVM_VERSION= 20
CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
@@ -147,7 +147,7 @@ post-patch:
post-patch-PORT_LLVM-on:
# WASM target hardcodes bundled lld
- @${REINPLACE_CMD} 's|"rust-lld"|"wasm-ld${LLVM_VERSION}"|' \
+ @${REINPLACE_CMD} 's|"rust-lld"|"wasm-ld${_LLVM_VERSION}"|' \
${WRKSRC}/compiler/rustc_target/src/spec/base/wasm.rs
do-configure: