diff options
author | joe <joe@FreeBSD.org> | 2001-08-15 14:37:26 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2001-08-15 14:37:26 +0000 |
commit | 839c5a13326aca13093860164f18e9875972e237 (patch) | |
tree | fea2b80ff4e84be710982fe3ffb3d8c1f2d208b2 /usr.sbin/crunch/crunchgen | |
parent | 327d46b1afe5d5b15a5577e7197331fef7fd8f8c (diff) | |
download | FreeBSD-src-839c5a13326aca13093860164f18e9875972e237.zip FreeBSD-src-839c5a13326aca13093860164f18e9875972e237.tar.gz |
Make crunchgen crunch pre-built object files again, i.e.:
progs prog1
special prog1 objdir ../../prog1/obj
special prog1 objs prog1.o
This fixes a bug that I introduced around the time of 4.2-release.
Reported by: Larry Baird <lab@gta.com>
Diffstat (limited to 'usr.sbin/crunch/crunchgen')
-rw-r--r-- | usr.sbin/crunch/crunchgen/crunchgen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 2b16894..edd752c 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -636,7 +636,7 @@ void fillin_program(prog_t *p) if (!p->objs && p->srcdir && is_nonempty_file(path)) fillin_program_objs(p, path); - if (!p->srcdir && verbose) + if (!p->srcdir && !p->objdir && verbose) warnx("%s: %s: %s", "warning: could not find source directory", infilename, p->name); @@ -644,7 +644,7 @@ void fillin_program(prog_t *p) warnx("%s: %s: warning: could not find any .o files", infilename, p->name); - if (!p->srcdir || !p->objs) + if (!p->objdir || !p->objs) p->goterror = 1; } @@ -962,18 +962,18 @@ void prog_makefile_rules(FILE *outmk, prog_t *p) fprintf(outmk, "\n# -------- %s\n\n", p->name); + fprintf(outmk, "%s_OBJDIR=", p->ident); + if (p->objdir) + fprintf(outmk, "%s", p->objdir); + else + fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n", + p->ident); + fprintf(outmk, "\n"); + if (p->srcdir && p->objs) { fprintf(outmk, "%s_SRCDIR=%s\n", p->ident, p->srcdir); fprintf(outmk, "%s_REALSRCDIR=%s\n", p->ident, p->realsrcdir); - fprintf(outmk, "%s_OBJDIR=", p->ident); - if (p->objdir) - fprintf(outmk, "%s", p->objdir); - else - fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n", - p->ident); - fprintf(outmk, "\n"); - fprintf(outmk, "%s_OBJS=", p->ident); output_strlst(outmk, p->objs); if (p->buildopts != NULL) { |