Date: Sat, 04 Jan 2020 01:53:44 +0100 From: Jan Beich <jbeich@FreeBSD.org> To: Piotr Kubaj <pkubaj@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r521968 - head/devel/llvm90 Message-ID: <1rsg-11pj-wny@FreeBSD.org> In-Reply-To: <202001032346.003NknYS021325@repo.freebsd.org> (Piotr Kubaj's message of "Fri, 3 Jan 2020 23:46:49 %2B0000 (UTC)") References: <202001032346.003NknYS021325@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Piotr Kubaj <pkubaj@FreeBSD.org> writes: > Author: pkubaj > Date: Fri Jan 3 23:46:49 2020 > New Revision: 521968 > URL: https://svnweb.freebsd.org/changeset/ports/521968 > > Log: > devel/llvm90: fix ELFv2 option autodetection > > Submitted by: alfredo.junior@eldorado.org.br > Approved by: brooks (maintainer timeout) > Differential Revision: https://reviews.freebsd.org/D22810 > > Modified: > head/devel/llvm90/Makefile > > Modified: head/devel/llvm90/Makefile > ============================================================================== > --- head/devel/llvm90/Makefile Fri Jan 3 23:31:39 2020 (r521967) > +++ head/devel/llvm90/Makefile Fri Jan 3 23:46:49 2020 (r521968) > @@ -69,7 +69,6 @@ OPTIONS_DEFINE_powerpc64= OPENMP > OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG > OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP > OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP > -OPTIONS_DEFAULT_powerpc64= OPENMP > OPTIONS_SINGLE= BACKENDS > OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD > OPTIONS_SUB= yes > @@ -218,7 +217,9 @@ EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTR > > # PPC_ABI variable is only defined after including bsd.port.options.mk > .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 > -OPTIONS_DEFAULT_powerpc64= ELFV2 > +OPTIONS_DEFAULT_powerpc64= ELFV2 OPENMP > +.else > +OPTIONS_DEFAULT_powerpc64= OPENMP > .endif Why not convert conditional to lazy expansion instead? Index: devel/llvm90/Makefile =================================================================== --- devel/llvm90/Makefile (revision 521969) +++ devel/llvm90/Makefile (working copy) @@ -69,6 +69,7 @@ OPTIONS_DEFINE_powerpc64= OPENMP OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP +OPTIONS_DEFAULT_powerpc64= ${PPC_ABI:tu:MELFV2} OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes @@ -215,13 +216,6 @@ EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${ .include <bsd.port.options.mk> -# PPC_ABI variable is only defined after including bsd.port.options.mk -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 -OPTIONS_DEFAULT_powerpc64= ELFV2 OPENMP -.else -OPTIONS_DEFAULT_powerpc64= OPENMP -.endif - # keep in sync with /usr/src/lib/clang/clang.build.mk # ----------- start of sync block ------------------ # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1rsg-11pj-wny>