git: 646b08b36e1c - 2021Q2 - gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled

[Jan Beich]

The branch 2021Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=646b08b36e1c6bf9673b7da726ec0d72af7eb07a

commit 646b08b36e1c6bf9673b7da726ec0d72af7eb07a
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-05-05 17:13:38 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-05-11 17:55:06 +0000

    gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled
    
    PR:             253771
    (cherry picked from commit 4e67118c7a58ddee28e376bc4291f348a9a0d38d)
---
 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 c60c749c0aed..6714f8d145fe 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=	11 # chase bundled LLVM in lang/rust for LTO
 .endif
 # Require newer Clang than what's in base system unless user opted out