Author: imp
Date: Mon Feb 3 19:10:33 2014
New Revision: 261445
URL: http://svnweb.freebsd.org/changeset/base/261445
Log:
Fix a bug introduced in r261437 that failed to honor "optional
profiling-routine" to work, since profiling-routine is not really an
option or a device, but a special case elsewhere in the code.
Modified:
head/usr.sbin/config/mkmakefile.c
Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c Mon Feb 3 18:56:41 2014
(r261444)
+++ head/usr.sbin/config/mkmakefile.c Mon Feb 3 19:10:33 2014
(r261445)
@@ -477,18 +477,19 @@ nextparam:
filetype = NODEPEND;
goto nextparam;
}
- if (eq(wd, "profiling-routine")) {
- filetype = PROFILING;
- goto nextparam;
- }
if (eq(wd, "nowerror")) {
nowerror = 1;
goto nextparam;
}
+ nreqs++;
+ /* Hack to allow "optional profiling-routine" to work */
+ if (eq(wd, "profiling-routine")) {
+ filetype = PROFILING;
+ goto nextparam;
+ }
if (std)
errout("standard entry %s has optional inclusion specifier
%s!\n",
this, wd);
- nreqs++;
STAILQ_FOREACH(dp, &dtab, d_next)
if (eq(dp->d_name, wd)) {
dp->d_done |= DEVDONE;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
