Date: Sun, 14 Jun 2015 08:07:17 -0700 From: Adrian Chadd <adrian@freebsd.org> To: Tijl Coosemans <tijl@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r284356 - head/usr.sbin/crunch/crunchgen Message-ID: <CAJ-VmomZvyYJVpdsyPwrbb-HtDQ9Y_j=3O7EQz_BZuf%2B1E-0jw@mail.gmail.com> In-Reply-To: <20150614114116.2ba761da@kalimero.tijl.coosemans.org> References: <201506132201.t5DM1LCV025599@svn.freebsd.org> <20150614114116.2ba761da@kalimero.tijl.coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 14 June 2015 at 02:41, Tijl Coosemans <tijl@freebsd.org> wrote: > On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd <adrian@FreeBSD.org> wrote: >> Author: adrian >> Date: Sat Jun 13 22:01:21 2015 >> New Revision: 284356 >> URL: https://svnweb.freebsd.org/changeset/base/284356 >> >> Log: >> Fix up crunchgen binary generation to work with external cross-build >> tools. >> >> * Allow STRIP to be overridden by the environment >> * Use CC to tie things together, not LD >> >> Tested: >> >> * i386, mips32 >> >> Submitted by: kan >> >> Modified: >> head/usr.sbin/crunch/crunchgen/crunchgen.c >> >> Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c >> ============================================================================== >> --- head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 20:15:44 2015 (r284355) >> +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Sat Jun 13 22:01:21 2015 (r284356) >> @@ -980,6 +980,7 @@ top_makefile_rules(FILE *outmk) >> prog_t *p; >> >> fprintf(outmk, "LD?= ld\n"); >> + fprintf(outmk, "STRIP?= strip\n"); >> if ( subtract_strlst(&libs, &libs_so) ) >> fprintf(outmk, "# NOTE: Some LIBS declarations below overridden by LIBS_SO\n"); >> >> @@ -1027,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, "\tstrip %s\n", execfname); >> + fprintf(outmk, "\t$(STRIP) %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"); >> @@ -1109,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t >> fprintf(outmk, " $(%s_LIBS)", p->ident); >> >> fprintf(outmk, "\n"); >> - fprintf(outmk, "\t$(LD) -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", >> + fprintf(outmk, "\t$(CC) -nostdlibs -dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)", > > Does CC understand -dc and -r? Apparently? -a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmomZvyYJVpdsyPwrbb-HtDQ9Y_j=3O7EQz_BZuf%2B1E-0jw>