diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-26 17:24:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-26 17:24:25 +0000 |
| commit | 1a4e3790891853793391862cfe47dd0a856a722e (patch) | |
| tree | 232ebc0a8af0ab8c1b5dc10b8bf7c48721a85e8b /usr.sbin/config | |
| parent | 81f74d908d1f26a7c15904beb330b8b96e3172f7 (diff) | |
discard still-born support for .o files in the "file" command..
this is OpenBSD.. source for everyone..
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 0c9cd3bfa44..96fd364c9cc 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkmakefile.c,v 1.23 2007/11/25 20:10:40 deraadt Exp $ */ +/* $OpenBSD: mkmakefile.c,v 1.24 2007/11/26 17:24:24 deraadt Exp $ */ /* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */ /* @@ -150,8 +150,6 @@ bad: static const char * srcpath(struct files *fi) { -#if 1 - /* Always have source, don't support object dirs for kernel builds. */ struct nvlist *nv, *nv1; const char *var; char *source; @@ -216,19 +214,6 @@ srcpath(struct files *fi) nv->nv_next = NULL; onlyone: return (nv->nv_name); - -#else - static char buf[MAXPATHLEN]; - - if (have_source || (fi->fi_flags & FI_ALWAYSSRC) != 0) - return (fi->fi_path); - if (objpath == NULL) { - error("obj-directory not set"); - return (NULL); - } - (void)snprintf(buf, sizeof buf, "%s/%s.o", objpath, fi->fi_base); - return (buf); -#endif } static int |