Date: Tue, 11 May 2021 17:55:53 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4e67118c7a58 - main - gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled Message-ID: <202105111755.14BHtrxb077076@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e67118c7a58ddee28e376bc4291f348a9a0d38d commit 4e67118c7a58ddee28e376bc4291f348a9a0d38d Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-05-05 17:13:38 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-05-11 17:52:58 +0000 gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled PR: 253771 MFH: 2021Q2 --- Mk/bsd.gecko.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index cfc54c878b9a..ac29b98d6a03 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -90,8 +90,8 @@ 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) -.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} +# 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} LLVM_DEFAULT= 12 # chase bundled LLVM in lang/rust for LTO .endif # Require newer Clang than what's in base system unless user opted out
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105111755.14BHtrxb077076>