From nobody Mon Aug 22 21:03:15 2022 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 4MBPw41mTrz4Zfmw; Mon, 22 Aug 2022 21:03:16 +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 4MBPw410lvz3nq4; Mon, 22 Aug 2022 21:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661202196; 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=XdzYEN8CpXNqtEkyBOEy72yrQM67/V/9L6OdG1vX7RU=; b=rqLXQxY+Lb/Ob9SUshBqKZJ98+uyVBKevcx1cDdB3CsZ30CEBNB7oQ6EEUmENdK113QWmD PA0mVfVsMH/1vt4MUTrwgivu4h+b3a9r7fHtRBBjHQjhqXQURzToWDg6DMCKfV4/L18xiM swShZWgCnSBoZe9nqMUDTnSVvCV5gy2LCbZbOF3YaicgpUoY4QfuMlsJyIjguXXKMf/FoM tzCLMdhXDM5T1E9bG4XCQ1Y51Y5qm60hFaXjU9RASonsBtOxcJfaYLp6G2/0Ua8cupnytx +2makE2jxacAOesOuzv1PAx1BYnYyLFm/SPUVKfnqpPpFghfx462WKUERARoFw== 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 4MBPw404Txz14KG; Mon, 22 Aug 2022 21:03:16 +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 27ML3FJf051117; Mon, 22 Aug 2022 21:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27ML3FeT051116; Mon, 22 Aug 2022 21:03:15 GMT (envelope-from git) Date: Mon, 22 Aug 2022 21:03:15 GMT Message-Id: <202208222103.27ML3FeT051116@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: fba998a3d897 - main - tools/build: Unbreak bmake bootstrap on Linux 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: fba998a3d897e6297baca74068e4ec1db7adaeec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661202196; 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=XdzYEN8CpXNqtEkyBOEy72yrQM67/V/9L6OdG1vX7RU=; b=seHp7ASJTF9nbwMBe564fKO3uE2735XpIla4nzsgcO7iULuA2dtt1AGzvwx/23OuRd4mjk SklDi0QNwKLvqEt24BblzId3smFVi+3rXbWVoTZD4A36rcyDj7c+WYwU00hHdzYHHO7oLG i8MNHT4H1Ti7TkXLNzwj9Lb8Vx9Oxjyi2ClYN2HcUSUaK5qacY9ofPDMi7KKKhGJn/a1KU 4b3OoKXmLQY2XYC6gFvL0rtdpWIbK68FAKVTA9naP6hgCwX1j/f0QgqZGvtaZPWj4vGMdc n2LLAqTic3qcCW3SnwkGpEvfQ9Ejp6gdLQGTXu5bDfvev3eaSAON/QB01fLMlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661202196; a=rsa-sha256; cv=none; b=V8cYx2MpraIHM5FQBg/2cpg6Be2T3pElOtkGAyRLiG300Laao9z8zBi4+sJg1egh6xROcU IVp5pGLe6Qj7Mi+yGgvlKulSj2rrHy/swjC0atgOghvONPjQBGrqsbTQp6Q5pbZHTvcWl1 HqdtysiXyoIY+0p9m08juipiPznfVnPaZJ6TFUiANtzzEbnSGUqmIRFuTbppsfRpblftJF Bbs1iYKfNrh5hUFCk8C2DrbIngB/S9QY1i/Sha+LBrKPATh2m74iG0iiK54XI1UYARxW/P EZ1JiyY741Rj1/iqQcA+0eHJlBUh+o5t7lOpfM89E3fQexA+Cao3VQO63M1PWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fba998a3d897e6297baca74068e4ec1db7adaeec commit fba998a3d897e6297baca74068e4ec1db7adaeec Author: Jessica Clarke AuthorDate: 2022-08-22 21:02:53 +0000 Commit: Jessica Clarke CommitDate: 2022-08-22 21:02:53 +0000 tools/build: Unbreak bmake bootstrap on Linux Currently make.py has a hack to add the cross-build headers to the include search path when bootstrapping bmake on Linux (but not macOS). This is a bit of an abuse of these headers, and e9ba1fd5eda2 was not prepared for this, since sys/bitcount.h won't exist in that instance (it gets copied into WORLDTMP during the legacy build). Work around this until we can wean the bmake bootstrap off using these headers by not including sys/bitcount.h when it doesn't exist. Fixes: e9ba1fd5eda2 ("tools/build: Provide FreeBSD's bitstring API when cross-building") --- tools/build/cross-build/include/common/sys/types.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h index 82436e7e9224..0bfe2bac2aea 100644 --- a/tools/build/cross-build/include/common/sys/types.h +++ b/tools/build/cross-build/include/common/sys/types.h @@ -69,7 +69,15 @@ 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