diff options
Diffstat (limited to 'lang/rust/Makefile')
| -rw-r--r-- | lang/rust/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index ed549b63d685..d77d89e0d15a 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=${LLVM_VERSION},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 @@ -224,11 +224,17 @@ do-configure: @${ECHO_CMD} 'cxx="${WRKDIR}/cxx-wrapper"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml .else -# use the builtin clang +# use the builtin clang when not using PORT_LLVM .if ${_target} == "wasm32-unknown-unknown" +.if ${PORT_OPTIONS:MPORT_LLVM} + @${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 +.else @${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 +.endif .else @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml |