]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Fix rescue build after r284356 with STRIP= by using proper STRIPBIN per build(7).
authorbdrewery <bdrewery@FreeBSD.org>
Tue, 28 Jul 2015 21:39:58 +0000 (21:39 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Tue, 28 Jul 2015 21:39:58 +0000 (21:39 +0000)
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

usr.sbin/crunch/crunchgen/crunchgen.c

index 79b240f397048c839c04225bfff2a244b56d125e..8ace15add1f85a446e63af0f8be899c82c361668 100644 (file)
@@ -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");