Date: Thu, 21 Mar 2024 16:21:53 -0400 From: Justin Hibbits <chmeee@has.gonegalt.net> To: Dimitry Andric <dim@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f0620ceeccf0 - main - Fix building of several libclang_rt libraries for powerpc64 and powerp64le Message-ID: <20240321162153.0048ccba@ralga.knownspace> In-Reply-To: <202403211711.42LHBlpr041561@gitrepo.freebsd.org> References: <202403211711.42LHBlpr041561@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 21 Mar 2024 17:11:47 GMT Dimitry Andric <dim@FreeBSD.org> wrote: > The branch main has been updated by dim: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=f0620ceeccf070a69352105c5dbc23cff499a732 > > commit f0620ceeccf070a69352105c5dbc23cff499a732 > Author: Dimitry Andric <dim@FreeBSD.org> > AuthorDate: 2024-03-21 13:53:36 +0000 > Commit: Dimitry Andric <dim@FreeBSD.org> > CommitDate: 2024-03-21 17:05:25 +0000 > > Fix building of several libclang_rt libraries for powerpc64 and > powerp64le > I reorganized the libclang_rt Makefile in e77a1bb27574 to make it > more readable and maintainable, but the check for 32-bit powerpc was > wrong. This caused almost no libclang_rt libraries to be built for > powerpc64 and powerpc64le. > > PR: 262706 > Reported by: tuexen > Fixes: e77a1bb27574 > MFC after: 3 days > --- > lib/libclang_rt/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile > index 46f7fdf814be..984da3f34156 100644 > --- a/lib/libclang_rt/Makefile > +++ b/lib/libclang_rt/Makefile > @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} > SUBDIR+= ${SD_SAFESTACK} > SUBDIR+= ${SD_STATS} > SUBDIR+= ${SD_UBSAN} > -.elif ${MACHINE_CPUARCH} == "powerpc" > +.elif ${MACHINE_ARCH} == "powerpc" If you're excluding 32-bit powerpc you'll want to also exclude powerpcspe. Though, you could just omit both powerpc and powerpcspe from the list here, since there's no default error case. > # nothing for 32-bit powerpc > .elif ${MACHINE_ARCH} == "powerpc64" > SUBDIR+= ${SD_ASAN} - Justin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240321162153.0048ccba>