Date: Sat, 4 Jan 2020 13:02:43 +0100 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Jan Beich <jbeich@freebsd.org> Cc: Piotr Kubaj <pkubaj@freebsd.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r521968 - head/devel/llvm90 Message-ID: <20200104120243.GA35260@KGPE-D16> In-Reply-To: <1rsg-11pj-wny@FreeBSD.org> References: <202001032346.003NknYS021325@repo.freebsd.org> <1rsg-11pj-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks, committed! On 20-01-04 01:53:44, Jan Beich wrote: > Piotr Kubaj <pkubaj@FreeBSD.org> writes: >=20 > > 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 > > =20 > > 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 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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=3D OPENMP > > OPTIONS_DEFAULT=3D BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK= LLDB PYCLANG > > OPTIONS_DEFAULT_amd64=3D COMPILER_RT GOLD OPENMP > > OPTIONS_DEFAULT_i386=3D COMPILER_RT OPENMP > > -OPTIONS_DEFAULT_powerpc64=3D OPENMP > > OPTIONS_SINGLE=3D BACKENDS > > OPTIONS_SINGLE_BACKENDS=3DBE_FREEBSD BE_NATIVE BE_STANDARD > > OPTIONS_SUB=3D yes > > @@ -218,7 +217,9 @@ EXTRAS_PATTERN=3D ${EXTRAS_COMMANDS:tW:C/ */|/g}|$= {EXTR > > =20 > > # PPC_ABI variable is only defined after including bsd.port.options.mk > > .if defined(PPC_ABI) && ${PPC_ABI} =3D=3D ELFv2 > > -OPTIONS_DEFAULT_powerpc64=3D ELFV2 > > +OPTIONS_DEFAULT_powerpc64=3D ELFV2 OPENMP > > +.else > > +OPTIONS_DEFAULT_powerpc64=3D OPENMP > > .endif >=20 > Why not convert conditional to lazy expansion instead? >=20 > Index: devel/llvm90/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- devel/llvm90/Makefile (revision 521969) > +++ devel/llvm90/Makefile (working copy) > @@ -69,6 +69,7 @@ OPTIONS_DEFINE_powerpc64=3D OPENMP > OPTIONS_DEFAULT=3D BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK L= LDB PYCLANG > OPTIONS_DEFAULT_amd64=3D COMPILER_RT GOLD OPENMP > OPTIONS_DEFAULT_i386=3D COMPILER_RT OPENMP > +OPTIONS_DEFAULT_powerpc64=3D ${PPC_ABI:tu:MELFV2} OPENMP > OPTIONS_SINGLE=3D BACKENDS > OPTIONS_SINGLE_BACKENDS=3DBE_FREEBSD BE_NATIVE BE_STANDARD > OPTIONS_SUB=3D yes > @@ -215,13 +216,6 @@ EXTRAS_PATTERN=3D ${EXTRAS_COMMANDS:tW:C/ */|/g}|${ > =20 > .include <bsd.port.options.mk> > =20 > -# PPC_ABI variable is only defined after including bsd.port.options.mk > -.if defined(PPC_ABI) && ${PPC_ABI} =3D=3D ELFv2 > -OPTIONS_DEFAULT_powerpc64=3D ELFV2 OPENMP > -.else > -OPTIONS_DEFAULT_powerpc64=3D 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. --MGYHOYXEY6WxJCY8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl4QfuMACgkQelmbhSCD nJ3dAA//a3HSLSRPRGafE7CM+cio3UT3k9uQfsLvFhERqis/SFDrSrLdMvuO63i4 mCW1aPG1oohEeLOwOCfevqyltFnfgzJuf5YqEQ5+FhAaJY1fB5+82fo5miXZvCAV fQFmFt0ssOp2MeSZe2fRPVMThHkYr1HI+/rLUJJkQdXKo4kBTXnl/gYwt1C/CG61 HrahAFuyoHlslCWDqehm4pFLAe97DUMR9+zuo3eJ2sVpd++SjZW/01pmK24Fo61r hnqusG70pOtx+82C5R7k0u7epD0SFJ4JdvF4VQqqhl8/tTJpg2lE8WFYnkfi9qlJ ZlP2Z2ZJjs7r82DCRXZyhJGHv7zzGkiAGbTtkt7xCvvBAbUY2ph1udWBIf1cSdvw lBD2U9qrCCE7R3KAESz0NPeZQ0k8qgix1YIwZpR28bIBbzv2zDDRBwmH9DHCTWos tSJJszuhoJww8V8EQ92sPkgeW5be3Apnf1VMn2sKL5vITUy9IbHUiBvNfZhhoox4 HNF47F0dTYeBBxccr8F6Oh8Fsijz/McG41S0etMEmgmjL9V7KycaTIsQBFSM1X60 jOf6LO8GNkHvG2oLNp0QrXVwnfq3krFZnE3fJlWHt9alL/YyD8Q9jxDIaWeNTBwd 8TkSN2hErndPmJmzBwpK73yxTWYPMNgs9lp0P6YSKBSAK0ZypVQ= =4jjy -----END PGP SIGNATURE----- --MGYHOYXEY6WxJCY8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200104120243.GA35260>