From nobody Sun Jan 29 23:53:10 2023 X-Original-To: dev-commits-src-main@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 4P4p6G4Tftz3bMrC; Sun, 29 Jan 2023 23:53:10 +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 4P4p6G401lz43k4; Sun, 29 Jan 2023 23:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036390; 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=Xm9o4F6sknGuuJmSQw3LVCDhsOTrQvRYn6zho5h5N1s=; b=db1vuN7GNerXcfoAgzAbVWKGXeoZN8UKluxlRp/sgJ5t+SFkG9jyzXsnxyK09CX0RkjKUH 0cAxtNKtsBPyqIbORyHaUuQ9LiLk6ZuD7DHIy4tZ4utIvBmCIN8SZr8+DhKrbG2umdmQ4I Kk/9NOkOwJqx0S113OmQL0dFDIHVjNtBilB96yoBO5dff5DRglds6YdTuzD4Zg9V1Vn+bl P3MRmSOupkzuHSu6RmFVBYrXwqAtIpUAo220YRY2ekoK31Csi8rUi930EdhkWrA0YCym0F Q+BEJjQqgFZJijIKAYnBYIzrgp5xVJeRDGEOCxdRjXG/nhJZxdsLW3hukxAfcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036390; 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=Xm9o4F6sknGuuJmSQw3LVCDhsOTrQvRYn6zho5h5N1s=; b=pmH1ahYv2pV4HVpZGurbqNF9v675mcb4C8KyX9ZQxCH2ZgMbR7tpPTXbwerglDeFhJh68n MUKh6N6LT1MCA70W28vnL2TMH6zu12yug/RdslfujjI0Q46ykvvdvSNTnFBHpPQ6OnizU2 JM1YoeRoMS5cQ4jwqV2TjCgzQOyEPljqhIHDyO8t1nZ3OlzWxvQ2Vl40Iwcoa+9r0Sk7hp UjoraZoEF0hJ2p1knkqzDp6nr5/HAazD5clSV40XVyFy3YHpBG8X53zB54i/oJgr0rGusY JuhxcfLCQWmSAOG4shNIS9T/vICxL7/K/U3NYfaur1snIMpbFsppp8JlPwVhYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675036390; a=rsa-sha256; cv=none; b=db6ualliv4epCMibJOh97cdUrlwegordg78DDPGhdVSt9W+zhcB/uT9GdYLfXABKpdwpEe i1zEV27pUGgAhjKo8GAk9mF/gh7kMXa60ZYRspp4iRwd8NPDwn19GjkVgk7DttMVwH10B2 rf7Vb1WvI/Z39MjwHWRFFVWWgTI0E6tO08K6zFxlVZyw+3+CCbiFYVauezpuWsM6f+mUGD YFI7cia7o5zjE11vk3PhDgZFV1ObIdB1YSkKTmqElNgfwH5BXjRze49/X/4bldEfLeLOLk YFOpULFOoXAmwqmObNvbbGkOep/wqWHr/VoKn8YKnkMTHJKmkdxb/7YA4eRdvg== 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 4P4p6G2hD3znQt; Sun, 29 Jan 2023 23:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30TNrAfG020454; Sun, 29 Jan 2023 23:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TNrA5l020453; Sun, 29 Jan 2023 23:53:10 GMT (envelope-from git) Date: Sun, 29 Jan 2023 23:53:10 GMT Message-Id: <202301292353.30TNrA5l020453@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: b78ae0367fff - main - Revert "tools/build: Unbreak bmake bootstrap on Linux" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b78ae0367fffcd127673cc61b4c6884479ccd86d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b78ae0367fffcd127673cc61b4c6884479ccd86d commit b78ae0367fffcd127673cc61b4c6884479ccd86d Author: Jessica Clarke AuthorDate: 2023-01-29 23:17:39 +0000 Commit: Jessica Clarke CommitDate: 2023-01-29 23:53:04 +0000 Revert "tools/build: Unbreak bmake bootstrap on Linux" Now that make.py no longer has the described hack on Linux we can drop this ugly workaround. This reverts commit fba998a3d897e6297baca74068e4ec1db7adaeec. --- tools/build/cross-build/include/common/sys/types.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h index 0bfe2bac2aea..82436e7e9224 100644 --- a/tools/build/cross-build/include/common/sys/types.h +++ b/tools/build/cross-build/include/common/sys/types.h @@ -69,15 +69,7 @@ struct cap_rights; typedef struct cap_rights cap_rights_t; -/* - * make.py uses these headers during the bmake bootstrap on Linux only, at - * which point sys/bitcount.h won't yet exist, so don't include it there. - * - * TODO: Untangle this mess. - */ -#if __has_include() /* Needed for bitstring */ #include -#endif #endif