Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jul 2015 21:39:59 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285986 - head/usr.sbin/crunch/crunchgen
Message-ID:  <201507282139.t6SLdxfZ045987@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507282139.t6SLdxfZ045987>