From nobody Sun Jun 02 23:35:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VstX65VJfz5LTNb; Sun, 02 Jun 2024 23:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VstX64zKsz47c5; Sun, 2 Jun 2024 23:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717371350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tf6BgMfPaZbQizIxGJxvVsMb4DMI+Xj2gNlHW0pAi6U=; b=in9JNJlakb+dLZHLWChwDJhZx+Ty0Iz41H5QerOuDw1iYFz2eL6tTxXwq6AT68u9T0ZIgb MYfl0OB0uFeMQ3DXhZK0HUh9WJklPs4vzUloHCSM7Jhh+FjAgTYH/o2BKzhHl9RbA/fiRf zFOWfnnViIO+5K+Ds41S5APGDJofwIs6obCbezFpMBcQAnchxzZSlrPGICDNPqQXzaD/0t YGrcvTRAS6is7Fm3Ar9+4NEcwV7lG67QvsW92vzQOJCe048clXeyfY5ruHF4Rd67sOdy4T OYvluFo43PcdrA0zBTlSk6ybaBBWpl40BHjrAqAquHi6/mHazqQpFXIUju2g9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717371350; a=rsa-sha256; cv=none; b=A+csNHYNu9CHrfqNu/PlEisNngN9psbHv88Qt97RTpBOlPznPQ6DD2XG/PO8qoDNo9Rs53 wJ2/uTTY8xRJoX4SX5oUMqPNMwtedCWpCR2H63KtAxvvWo5dWakXUjfycrqbR3pks8oRrQ KXLmkN1otiVzSeXgVoQYu3/r2t9/cQ+QZqtvGktsfbYbFkTLW+NFroq6VnAR5OmGyJXCnM OontGmBicAeTXRw2UB1Iogc/XjVdzZV2zYaALsJUvlApcuYRgCur0Z/eZx9losfhe1/k4F GtL7HD8COOrTnk2utk/5nIi0tAIghyq0yi6gkgsImVB8Iz5DdqYVtxaIpGESdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717371350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tf6BgMfPaZbQizIxGJxvVsMb4DMI+Xj2gNlHW0pAi6U=; b=gTKWJ5CghSnmpJ+e2NqN90sPmVg5HupzZVt/HqxXaKjYqM8TU00L9aaj69Q7UszV/nQRue TzaVmr9Quy7sxl535Iy/UMasykl1OyGiE5S9NUzqaA2OVdHbT9l/9tXf/4otImk+kPgDHP yHPaUVvm7LbFMQUOiQJ5tRyCDZsEWbmegq8Oo5ifO8tLoDOTZDO/UA+4IT32Di9XC99BVn FBDnUIeceiBvpZtJU8rDVhr7hXBD0CsEnVIWuE3Z/CpBXZdHk3P2vsOBv+JfQUrR/NPJVs KQ2y9JC5+evxIH4B/22SY+grSiyhclT2vYhYsUaYiswXLVE4/2d0jFGHNen0Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VstX64ZHSz1BS1; Sun, 2 Jun 2024 23:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 452NZoVH038447; Sun, 2 Jun 2024 23:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NZoAY038444; Sun, 2 Jun 2024 23:35:50 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:35:50 GMT Message-Id: <202406022335.452NZoAY038444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: a20a903b167c - main - Makefile.inc1: Allow showconfig and test-system-* if (X)CC is GCC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a20a903b167c80a35b83f10c9035d9dc99071b06 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a20a903b167c80a35b83f10c9035d9dc99071b06 commit a20a903b167c80a35b83f10c9035d9dc99071b06 Author: Jessica Clarke AuthorDate: 2024-06-02 23:16:58 +0000 Commit: Jessica Clarke 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}