From 91f6670c97b88fff4b014a90d2880ab476d05f24 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 28 Aug 2024 15:53:51 -0400 Subject: build: Include the auto-flag build logs in config.log --- build/flags.mk | 1 + build/header.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/flags.mk b/build/flags.mk index 0a62f32..ad2a75e 100644 --- a/build/flags.mk +++ b/build/flags.mk @@ -119,6 +119,7 @@ gen/flags.mk: ${AUTO_FLAGS} @printf 'NOLIBS := %s\n' "$$XNOLIBS" >>$@ @test "${OS}-${SAN}" != FreeBSD-y || printf 'POSTLINK = elfctl -e +noaslr $$@\n' >>$@ @cat ${.ALLSRC} >>$@ + @cat ${.ALLSRC:%=%.log} >gen/flags.log ${VCAT} $@ .PHONY: gen/flags.mk diff --git a/build/header.mk b/build/header.mk index 8dc7a56..b838f64 100644 --- a/build/header.mk +++ b/build/header.mk @@ -66,7 +66,7 @@ gen/config.h: ${PKG_HEADERS} ${HEADERS} @printf '#define BFS_CONFIG_H\n' >>$@ @cat ${.ALLSRC} >>$@ @printf '#endif // BFS_CONFIG_H\n' >>$@ - @cat gen/cc.log ${.ALLSRC:%=%.log} >gen/config.log + @cat gen/cc.log gen/flags.log ${.ALLSRC:%=%.log} >gen/config.log ${VCAT} $@ @printf '%s' "$$CONFFLAGS" | build/embed.sh >gen/confflags.i @printf '%s' "$$XCC" | build/embed.sh >gen/cc.i -- cgit v1.2.3