From nobody Fri Apr 28 23:15:04 2023 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 4Q7T3F12g0z486Xj; Fri, 28 Apr 2023 23:15:05 +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 4Q7T3F0B2lz3rQl; Fri, 28 Apr 2023 23:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682723705; 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=bEyjTYgCuDSZxnQJ8CRH1EHLAzFSVF+9tVxtIQa/ncc=; b=JV1pp8Z9Lxj1jLZv2hlWuap8zHcnYgsuqbhelvbozrrgYfSla43EM8jeWB567tBYo7nUg4 v15RUbEuligXoVf3mMSP9decu0QgFuG+9NFZmvy0AEnBQ3fwAGlyuYAia6GWWVHYNXwNgd YZ0ckOOmDXmjUv9KCJBLljfi3h0HWgy7PMvaTAiy+ynQQKg2/5cUoO4ZlfD37Wr02pQpk1 c7uECxq5LFKv+J7vxroqMmsCgapvqXX0TXduAyTrKMaXhc46JDSUIGKXGfcLYorzF3WObU /+VTZb3CxN7ehH9DU3KnDanecKU/abNlBb9B0H9pfrSJ6PPzzq5W0KpJ4HjlWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682723705; 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=bEyjTYgCuDSZxnQJ8CRH1EHLAzFSVF+9tVxtIQa/ncc=; b=UNEOUxbnYzEShg3sgJmmk9HwPLQ0NEaUbPK9uF4Eq+IjF6Z+hwWhxgGag7CzhDTRxDnd0e gU3YLEG5E/v8evs4Qee6vXT+CIeAQkGa/tuTH/xAghCVQuZoDUR5EiwfDravjlIo72W6m6 NEXwAEBOdUBwxmvcJ8dSBit9WFHDEBW7QEnOlchNHMu+mCe+XTi8+32Fy6WwxOG4ShtTXl YomBq2UHvsUymmKg4swZkg8/tR/lTdh8s98EkkfTbE9bAmIFTBOCbp6jQUxF0OC1SitHzZ 8P8ToAgNzqzFvoqU+8q2270V0KR504MRAwZdz/XXmpDjZKg8S00qUwEnjZq7DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682723705; a=rsa-sha256; cv=none; b=PG7TX17ghCsYErsmgCtunSLh04cN6A/YSx7L+5girVMdq4ziVCzdQbaPMBlT7KLVqOEzkq Nfi40zRMkc1C5L/gxCHDB9daHN1uPhuGxW0oqCZUM0TcQr0l5Z8Q6J2lbUqxtq1kejZg+a UXS5cEuUER3OV7jvU+XBEdpse1HNhyJRHsqyk0O600O07hxjbR6LBaHzoi/d/SPll+SoWJ u5VegfTyAv0z9T2nJHBEeHphxsTVp96sb83rNF3JTV0AQPXmu4pIi/zB078fKnoIrAfZkk ia7y2uxpre4ni5PJFj19wc+oT2QtNFoQcIOTMhP19U3MIa026x0qhZqO/aPf1w== 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 4Q7T3D6MclzJp8; Fri, 28 Apr 2023 23:15:04 +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 33SNF4OU038399; Fri, 28 Apr 2023 23:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SNF4lW038398; Fri, 28 Apr 2023 23:15:04 GMT (envelope-from git) Date: Fri, 28 Apr 2023 23:15:04 GMT Message-Id: <202304282315.33SNF4lW038398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: b347c2284603 - main - cross-build: Add common compatibility headers after OS-specific ones 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: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b347c22846038a070ea576e904771178acf5a302 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=b347c22846038a070ea576e904771178acf5a302 commit b347c22846038a070ea576e904771178acf5a302 Author: Alex Richardson AuthorDate: 2023-04-21 22:06:51 +0000 Commit: Alex Richardson CommitDate: 2023-04-28 23:10:25 +0000 cross-build: Add common compatibility headers after OS-specific ones The current order is rather counter-intuitive and it appears to work fine if we swap the order. Pull Request: https://github.com/freebsd/freebsd-src/pull/725 Reviewed by: imp --- tools/build/mk/Makefile.boot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot index 138dff45930b..3bbb183021b2 100644 --- a/tools/build/mk/Makefile.boot +++ b/tools/build/mk/Makefile.boot @@ -35,7 +35,6 @@ LIBZ:=${WORLDTMP}/legacy/usr/lib/libz.a CFLAGS+= -Werror=implicit-function-declaration -Werror=implicit-int \ -Werror=return-type -Wundef CFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common # This is needed for code that compiles for pre-C11 C standards CWARNFLAGS.clang+=-Wno-typedef-redefinition # bsd.sys.mk explicitly turns on -Wsystem-headers, but that's extremely @@ -69,6 +68,11 @@ CFLAGS+= -idirafter ${SRCTOP}/contrib/libarchive/libarchive .endif .endif # ${.MAKE.OS} != "FreeBSD" +.if ${.MAKE.OS} != "FreeBSD" +# Add the common compatibility headers after the OS-specific ones. +CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common +.endif + # we do not want to capture dependencies referring to the above UPDATE_DEPENDFILE= no