Date: Fri, 17 May 2024 16:01:27 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 16d8dfde0c0f - main - aarch64: disable LIB32 with gcc Message-ID: <202405171601.44HG1RH4047215@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=16d8dfde0c0fb2eb95f2dd8c350ae652fa2c68fa commit 16d8dfde0c0fb2eb95f2dd8c350ae652fa2c68fa Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2024-05-17 15:47:06 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2024-05-17 16:01:18 +0000 aarch64: disable LIB32 with gcc gcc doesn't have -m32 support on aarch64 so mark LIB32 broken there. We have to check both COMPILER_TYPE and X_COMPILER_TYPE becuase X_COMPILER_TYPE is only conditionally set and COMPILER_TYPE is the host compiler in Makefile.inc1. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D45089 --- share/mk/src.opts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 00405e3f934f..501df88cd776 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -303,7 +303,7 @@ __DEFAULT_YES_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB .endif # LIB32 is not supported on all 64-bit architectures. -.if (${__T} == "amd64" || ${__T:Maarch64*} != "" || ${__T} == "powerpc64") +.if (${__T:Maarch64*} != "" && ((defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} != "gcc") || (!defined(X_COMPILER_TYPE) && ${COMPILER_TYPE} != "gcc"))) || ${__T} == "amd64" || ${__T} == "powerpc64" __DEFAULT_YES_OPTIONS+=LIB32 .else BROKEN_OPTIONS+=LIB32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405171601.44HG1RH4047215>