diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2024-06-18 17:03:22 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2024-06-18 17:03:22 -0400 |
| commit | f6775906d136bbeacf3cd45443c080be2dd1f2e9 (patch) | |
| tree | 70ace9766a98ad021aa38ca9eedf89d00cf2dff9 | |
| parent | 49a5d48d0a43bac313c8b8d1b167e60da9eaadf6 (diff) | |
| download | bfs-f6775906d136bbeacf3cd45443c080be2dd1f2e9.tar.xz | |
build: Rename CONFIG to CONFFLAGS
| -rw-r--r-- | build/header.mk | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/parse.c | 12 | ||||
| -rw-r--r-- | src/prelude.h | 2 | ||||
| -rw-r--r-- | src/version.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/build/header.mk b/build/header.mk index 75fda41..16a25ca 100644 --- a/build/header.mk +++ b/build/header.mk @@ -63,7 +63,7 @@ gen/config.h: ${PKG_HEADERS} ${HEADERS} @printf '#endif // BFS_CONFIG_H\n' >>$@ @cat ${.ALLSRC:%=%.log} >gen/config.log ${VCAT} $@ - @printf '%s' "$$CONFIG" | build/embed.sh >gen/config.i + @printf '%s' "$$CONFFLAGS" | build/embed.sh >gen/confflags.i @printf '%s' "$$XCC" | build/embed.sh >gen/cc.i @printf '%s' "$$XCPPFLAGS" | build/embed.sh >gen/cppflags.i @printf '%s' "$$XCFLAGS" | build/embed.sh >gen/cflags.i @@ -83,7 +83,7 @@ nproc() { } # Save the ./configure command line for bfs --version -export CONFIG="$0 $*" +export CONFFLAGS="$*" # Default to `make` MAKE="${MAKE-make}" diff --git a/src/parse.c b/src/parse.c index 9035344..86ce72c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -2961,12 +2961,12 @@ static struct bfs_expr *parse_version(struct bfs_parser *parser, int arg1, int a printf("Copyright © Tavian Barnes and the bfs contributors\n"); printf("No rights reserved (https://opensource.org/license/0BSD)\n\n"); - printf("CONFIG := %s\n", bfs_config); - printf("CC := %s\n", bfs_cc); - printf("CPPFLAGS := %s\n", bfs_cppflags); - printf("CFLAGS := %s\n", bfs_cflags); - printf("LDFLAGS := %s\n", bfs_ldflags); - printf("LDLIBS := %s\n", bfs_ldlibs); + printf("CONFFLAGS := %s\n", bfs_confflags); + printf("CC := %s\n", bfs_cc); + printf("CPPFLAGS := %s\n", bfs_cppflags); + printf("CFLAGS := %s\n", bfs_cflags); + printf("LDFLAGS := %s\n", bfs_ldflags); + printf("LDLIBS := %s\n", bfs_ldlibs); printf("\n%s\n", BFS_HOMEPAGE); diff --git a/src/prelude.h b/src/prelude.h index bca16b2..34ce803 100644 --- a/src/prelude.h +++ b/src/prelude.h @@ -40,7 +40,7 @@ // when the version number changes extern const char bfs_version[]; -extern const char bfs_config[]; +extern const char bfs_confflags[]; extern const char bfs_cc[]; extern const char bfs_cppflags[]; extern const char bfs_cflags[]; diff --git a/src/version.c b/src/version.c index 9e5c82f..8383350 100644 --- a/src/version.c +++ b/src/version.c @@ -7,8 +7,8 @@ const char bfs_version[] = { #include "version.i" }; -const char bfs_config[] = { -#include "config.i" +const char bfs_confflags[] = { +#include "confflags.i" }; const char bfs_cc[] = { |