On Sun, 14 Jun 2015 08:31:32 -0700 Adrian Chadd <adr...@freebsd.org> wrote: > On 14 June 2015 at 08:28, Tijl Coosemans <t...@freebsd.org> wrote: >> On Sun, 14 Jun 2015 08:07:17 -0700 Adrian Chadd <adr...@freebsd.org> wrote: >>> On 14 June 2015 at 02:41, Tijl Coosemans <t...@freebsd.org> wrote: >>>> On Sat, 13 Jun 2015 22:01:21 +0000 (UTC) Adrian Chadd <adr...@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) >>>>> @@ -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? >> >> Hmm, it's undocumented but it seems to recognise -r and pass it on to >> the linker. Not -dc though. It's safer to use: -Wl,-dc -Wl,-r > > Ok. Would you mind committing it? I'm not near a FreeBSD machine at the > moment.
Done in r284382. _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"