Date: Sat, 16 Jul 2022 21:55:37 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6b2cf7d799d8 - main - www/firefox: do not attempt to build with LLVM != 13 Message-ID: <202207162155.26GLtbeD019930@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b2cf7d799d86f3e577d45a11b1010305e79351f commit 6b2cf7d799d86f3e577d45a11b1010305e79351f Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2022-07-16 21:51:11 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2022-07-16 21:51:11 +0000 www/firefox: do not attempt to build with LLVM != 13 we do not have the wasm tooling/runtime for that right now, and people keep messing with the defaults and running into issues. --- Mk/bsd.gecko.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 70a4ea49a0b9..901911708b41 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -95,11 +95,12 @@ MOZ_OPTIONS+= --with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" . if !exists(/usr/bin/llvm-objdump) MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" . endif -# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled -. if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} +# fix LLVM to version 13, as that's the only reasonable wasi-toolchain +# we currently have +# if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} LLVM_DEFAULT= 13 # chase bundled LLVM in lang/rust for LTO LLVM_VERSION= 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} -. endif +# endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207162155.26GLtbeD019930>