From owner-svn-src-head@freebsd.org Tue Jul 28 21:39:59 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E6CE9AD94B;
Tue, 28 Jul 2015 21:39:59 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5EBF7C8;
Tue, 28 Jul 2015 21:39:59 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6SLdx5n045988;
Tue, 28 Jul 2015 21:39:59 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6SLdxfZ045987;
Tue, 28 Jul 2015 21:39:59 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201507282139.t6SLdxfZ045987@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 28 Jul 2015 21:39:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r285986 - head/usr.sbin/crunch/crunchgen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jul 2015 21:39:59 -0000
Author: bdrewery
Date: Tue Jul 28 21:39:58 2015
New Revision: 285986
URL: https://svnweb.freebsd.org/changeset/base/285986
Log:
Fix rescue build after r284356 with STRIP= by using proper STRIPBIN per build(7).
This was causing the following error:
rescue
sh: rescue: not found
*** [rescue] Error code 127
make[1]: stopped in /usr/obj/usr/src/rescue/rescue
Sponsored by: EMC / Isilon Storage Division
Modified:
head/usr.sbin/crunch/crunchgen/crunchgen.c
Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c
==============================================================================
--- head/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jul 28 21:10:58 2015 (r285985)
+++ head/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jul 28 21:39:58 2015 (r285986)
@@ -980,7 +980,7 @@ top_makefile_rules(FILE *outmk)
prog_t *p;
fprintf(outmk, "LD?= ld\n");
- fprintf(outmk, "STRIP?= strip\n");
+ fprintf(outmk, "STRIPBIN?= strip\n");
if ( subtract_strlst(&libs, &libs_so) )
fprintf(outmk, "# NOTE: Some LIBS declarations below overridden by LIBS_SO\n");
@@ -1028,7 +1028,7 @@ top_makefile_rules(FILE *outmk)
fprintf(outmk, "\t$(CC) -static -o %s %s.o $(CRUNCHED_OBJS) $(LIBS)\n",
execfname, execfname);
fprintf(outmk, ".endif\n");
- fprintf(outmk, "\t$(STRIP) %s\n", execfname);
+ fprintf(outmk, "\t$(STRIPBIN) %s\n", execfname);
fprintf(outmk, "realclean: clean subclean\n");
fprintf(outmk, "clean:\n\trm -f %s *.lo *.o *_stub.c\n", execfname);
fprintf(outmk, "subclean: $(SUBCLEAN_TARGETS)\n");