Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Oct 2021 06:11:07 GMT
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 19a32560ab25 - stable/12 - Create CFLAGS_EARLY.file for boot loader.
Message-ID:  <202110080611.1986B7UZ007643@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kevans:

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

commit 19a32560ab25624d9a31c674d07edb2e6b8f8992
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2020-08-28 17:36:14 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 05:24:27 +0000

    Create CFLAGS_EARLY.file for boot loader.
    
    Some external code requires a specific set of include paths to work
    properly since it emulates the typical environment the code is used
    in. Enable this by creating a CFLAGS_EARLY.file variable that can be
    used to build this stack. Otherwise the include stack we build for
    stand programs may get in the way. Code that uses this feature has to
    tolerate the normal stack of inclues being last on the list (and
    presumably unused), though.
    
    Generally, it it should only be used for the specific include
    directories. Defines and that sort of thing should be done in the
    normal CFLAGS variable. There is a global CFLAGS_EARY hook as well for
    everything in a Makefile.
    
    (cherry picked from commit f9553770c03e82abcae07397025797ef346fbdab)
---
 stand/defs.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/stand/defs.mk b/stand/defs.mk
index 6fba2051301b..431b629939d8 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -63,6 +63,11 @@ LIBSA32=	${BOOTOBJ}/libsa32/libsa32.a
 
 # Standard options:
 CFLAGS+=	-nostdinc
+# Allow CFLAGS_EARLY.file/target so that code that needs specific stack
+# of include paths can set them up before our include paths. Normally
+# the only thing that should be there are -I directives, and as few of
+# those as possible.
+CFLAGS+=	${CFLAGS_EARLY} ${CFLAGS_EARLY.${.IMPSRC:T}} ${CFLAGS_EARLY.${.TARGET:T}}
 .if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
 CFLAGS+=	-I${BOOTOBJ}/libsa32
 .else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110080611.1986B7UZ007643>