git: b78ae0367fff - main - Revert "tools/build: Unbreak bmake bootstrap on Linux"

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=b78ae0367fffcd127673cc61b4c6884479ccd86d

commit b78ae0367fffcd127673cc61b4c6884479ccd86d
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-01-29 23:17:39 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
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(<sys/bitcount.h>)
 /* Needed for bitstring */
 #include <sys/bitcount.h>
-#endif
 
 #endif