diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-05-05 17:13:38 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-05-11 17:55:06 +0000 |
| commit | 646b08b36e1c6bf9673b7da726ec0d72af7eb07a (patch) | |
| tree | b31ccfbc696bf6a8dcb878193a15cc6c99e65d8d /Mk | |
| parent | b33587a4adc2dc846f129cb4e167cb6efb33fa12 (diff) | |
| download | ports-646b08b36e1c6bf9673b7da726ec0d72af7eb07a.tar.gz ports-646b08b36e1c6bf9673b7da726ec0d72af7eb07a.zip | |
gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled
PR: 253771
(cherry picked from commit 4e67118c7a58ddee28e376bc4291f348a9a0d38d)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 4 |
1 files 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 |