From owner-dev-commits-ports-all@freebsd.org Tue May 11 17:55:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA0F1640327; Tue, 11 May 2021 17:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fflvq4VD4z4cyN; Tue, 11 May 2021 17:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D0CB1C666; Tue, 11 May 2021 17:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14BHtp3O077023; Tue, 11 May 2021 17:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BHtptg077022; Tue, 11 May 2021 17:55:51 GMT (envelope-from git) Date: Tue, 11 May 2021 17:55:51 GMT Message-Id: <202105111755.14BHtptg077022@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 646b08b36e1c - 2021Q2 - gecko: ignore llvm in DEFAULT_VERSIONS if LTO is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 646b08b36e1c6bf9673b7da726ec0d72af7eb07a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 17:55:51 -0000 The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=646b08b36e1c6bf9673b7da726ec0d72af7eb07a commit 646b08b36e1c6bf9673b7da726ec0d72af7eb07a Author: Jan Beich AuthorDate: 2021-05-05 17:13:38 +0000 Commit: Jan Beich 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