diff options
author | Ron Yorston <rmy@pobox.com> | 2015-06-23 14:45:23 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-06-23 14:45:23 +0100 |
commit | 171bc72f6a8f996376ca02e44edd56409b27a927 (patch) | |
tree | 5c9503f18038408ccdc921267c37f6fe93b27035 | |
parent | f7c0538b3abe28167855ea40001b40702ef8ddf9 (diff) | |
download | busybox-w32-171bc72f6a8f996376ca02e44edd56409b27a927.tar.gz busybox-w32-171bc72f6a8f996376ca02e44edd56409b27a927.tar.bz2 busybox-w32-171bc72f6a8f996376ca02e44edd56409b27a927.zip |
libbb: really add build details to banner
Look at the environment variable during compilation, not runtime.
-rw-r--r-- | Makefile.flags | 3 | ||||
-rw-r--r-- | libbb/appletlib.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.flags b/Makefile.flags index a2fba5028..58fcf33eb 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
@@ -15,7 +15,8 @@ CPPFLAGS += \ | |||
15 | -include include/autoconf.h \ | 15 | -include include/autoconf.h \ |
16 | -D_GNU_SOURCE -DNDEBUG \ | 16 | -D_GNU_SOURCE -DNDEBUG \ |
17 | $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \ | 17 | $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \ |
18 | -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP | 18 | -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP \ |
19 | -D"MINGW_VER=KBUILD_STR($(MINGW_VER))" | ||
19 | 20 | ||
20 | CFLAGS += $(call cc-option,-Wall,) | 21 | CFLAGS += $(call cc-option,-Wall,) |
21 | CFLAGS += $(call cc-option,-Wshadow,) | 22 | CFLAGS += $(call cc-option,-Wshadow,) |
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index eafc5fce8..06857ed61 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
@@ -635,10 +635,9 @@ static int busybox_main(char **argv) | |||
635 | dup2(1, 2); | 635 | dup2(1, 2); |
636 | full_write2_str(bb_banner); /* reuse const string */ | 636 | full_write2_str(bb_banner); /* reuse const string */ |
637 | full_write2_str(" multi-call binary.\n"); /* reuse */ | 637 | full_write2_str(" multi-call binary.\n"); /* reuse */ |
638 | #if ENABLE_PLATFORM_MINGW32 | 638 | #if defined(MINGW_VER) |
639 | if ((a=getenv("MINGW_VERSION"))) { | 639 | if (strlen(MINGW_VER)) { |
640 | full_write2_str(a); | 640 | full_write2_str(MINGW_VER "\n\n"); |
641 | full_write2_str("\n\n"); | ||
642 | } | 641 | } |
643 | #endif | 642 | #endif |
644 | full_write2_str( | 643 | full_write2_str( |