diff options
| author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-07-16 21:51:11 +0000 |
|---|---|---|
| committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-07-16 21:51:11 +0000 |
| commit | 6b2cf7d799d86f3e577d45a11b1010305e79351f (patch) | |
| tree | 92bb729afcd1de4869a8e48cab91011eda70bcd6 | |
| parent | 900e505409f9a5863f1a57109c6978c97aa5e9f7 (diff) | |
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.
| -rw-r--r-- | Mk/bsd.gecko.mk | 7 |
1 files 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} |