From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 21 Apr 2016 22:24:53 +0000 (+0200)
Subject: generate_BUFSIZ.sh: catch BUFSIZE < 1024 also on "big" builds
X-Git-Tag: 1_25_0~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7ff24bd5fb37c58d9e41743a910df147357dda61;p=oweals%2Fbusybox.git

generate_BUFSIZ.sh: catch BUFSIZE < 1024 also on "big" builds

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/scripts/generate_BUFSIZ.sh b/scripts/generate_BUFSIZ.sh
index 8aa0174a6..750fedbef 100755
--- a/scripts/generate_BUFSIZ.sh
+++ b/scripts/generate_BUFSIZ.sh
@@ -105,14 +105,14 @@ if $postcompile; then
 	COMMON_BUFSIZE=$(( (-END) & PAGE_MASK ))
 	echo "COMMON_BUFSIZE = $COMMON_BUFSIZE bytes"
 
-	if test x"$method" = x"1k"; then
+	if test x"$method" != x"malloc"; then
 		if test $COMMON_BUFSIZE -lt 1024; then
 			# _end[] has no enough space for bb_common_bufsiz1[]
 			rm -- "$common_bufsiz_h.1k.OK" 2>/dev/null
 			{ md5sum <.config | cut -d' ' -f1; stat -c "%Y" .config; } >"$common_bufsiz_h.1k.FAIL"
 			echo "Warning! Space in _end[] is too small ($COMMON_BUFSIZE bytes)!"
 			echo "Rerun make to build a binary which doesn't use it!"
-			rm busybox_unstripped
+			rm busybox_unstripped busybox
 			exitcmd="exit 1"
 		else
 			rm -- "$common_bufsiz_h.1k.FAIL" 2>/dev/null