config(8) does not add post-processing for source file with
compile-with command in sys/conf/files
Ryan Stone
rysto32 at gmail.com
Wed Nov 9 01:51:43 UTC 2011
On Tue, Oct 18, 2011 at 10:21 PM, Paul Ambrose <ambrosehua at gmail.com> wrote:
> when I digged the a PR(bin/160275), I found in_proto.c and
> if_ethersubr.c ( see sys/conf/files ) does not get
> ${NORMAL_CTFCONVERT} post-processing in Makefile
> (/usr/obj/usr/src/sys/MYKERNEL/Makefile) generated by config(8), so
> the objs does not contain ctf section
Here's a second attempt at this one. I think that this version is
much cleaner than the other options in this thread. If it survives a
make universe I intend to commit this:
Index: usr.sbin/config/mkmakefile.c
===================================================================
--- usr.sbin/config/mkmakefile.c (revision 227341)
+++ usr.sbin/config/mkmakefile.c (working copy)
@@ -762,16 +762,21 @@
break;
}
snprintf(cmd, sizeof(cmd),
- "${%s_%c%s}\n\t@${NORMAL_CTFCONVERT}", ftype,
+ "${%s_%c%s}\n", ftype,
toupper(och),
ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
compilewith = cmd;
}
*cp = och;
if (strlen(ftp->f_objprefix))
- fprintf(f, "\t%s $S/%s\n\n", compilewith, np);
+ fprintf(f, "\t%s $S/%s\n", compilewith, np);
else
- fprintf(f, "\t%s\n\n", compilewith);
+ fprintf(f, "\t%s\n", compilewith);
+
+ if (!(ftp->f_flags & NO_OBJ))
+ fprintf(f, "\t@${NORMAL_CTFCONVERT}\n\n");
+ else
+ fprintf(f, "\n");
}
}
More information about the freebsd-current
mailing list