Date: Sun, 2 Jun 2024 23:35:50 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a20a903b167c - main - Makefile.inc1: Allow showconfig and test-system-* if (X)CC is GCC Message-ID: <202406022335.452NZoAY038444@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a20a903b167c80a35b83f10c9035d9dc99071b06 commit a20a903b167c80a35b83f10c9035d9dc99071b06 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-06-02 23:16:58 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2024-06-02 23:16:58 +0000 Makefile.inc1: Allow showconfig and test-system-* if (X)CC is GCC This case gets hit in make universe on Linux, since we will first run make test-system-compiler to determine whether to use the system or universe toolchain, during which time CC is the host's, GCC, and XCC isn't set, so defaults to the same. Fixes: 4c0dfd5959bd ("arm: fail early on gcc builds") --- Makefile.inc1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 90439adcbc09..28ab291928ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -172,6 +172,7 @@ LIBCOMPAT_INCLUDE_DIRS+= i386 LIBCOMPAT_INCLUDE_DIRS+= arm .endif +.if !defined(_MKSHOWCONFIG) .if ((defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == "gcc") || \ (!defined(X_COMPILER_TYPE) && ${COMPILER_TYPE} == "gcc")) .if ${TARGET} == "arm" @@ -195,6 +196,7 @@ _GCC_BROKEN=boot code linker script issues. .endif .endif .endif +.endif .if ${.MAKE.OS} != "FreeBSD" CROSSBUILD_HOST=${.MAKE.OS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406022335.452NZoAY038444>