diff options
| author | imp <imp@FreeBSD.org> | 2014-02-03 19:10:33 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-02-03 19:10:33 +0000 |
| commit | db1869454ba139c76058a7e45366ee983f22b2ae (patch) | |
| tree | 2cfff12b50c20ade2166bf6ea06c8835dc0c8842 /usr.sbin/config | |
| parent | c59be8482273822c58a699a392d5ba8f76901745 (diff) | |
| download | FreeBSD-src-db1869454ba139c76058a7e45366ee983f22b2ae.zip FreeBSD-src-db1869454ba139c76058a7e45366ee983f22b2ae.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 8846bfd..417ef68 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -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; |
