Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build.

This commit is contained in:
uebayasi 2015-09-01 20:18:41 +00:00
parent a7c125a050
commit e53d4b70ba
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/config/mkmakefile.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkmakefile.c,v 1.55 2015/09/01 16:01:23 uebayasi Exp $ */ /* $NetBSD: mkmakefile.c,v 1.56 2015/09/01 20:18:41 uebayasi Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -45,7 +45,7 @@
#endif #endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: mkmakefile.c,v 1.55 2015/09/01 16:01:23 uebayasi Exp $"); __RCSID("$NetBSD: mkmakefile.c,v 1.56 2015/09/01 20:18:41 uebayasi Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <ctype.h> #include <ctype.h>
@ -298,14 +298,14 @@ emitdefs(FILE *fp)
static void static void
emitfile(FILE *fp, struct files *fi) emitfile(FILE *fp, struct files *fi)
{ {
const char *srcdir = "$S/"; const char *defprologue = "$S/";
const char *prologue, *prefix, *sep; const char *prologue, *prefix, *sep;
if (Sflag) if (Sflag)
srcdir = ""; defprologue = "";
prologue = prefix = sep = ""; prologue = prefix = sep = "";
if (*fi->fi_path != '/') { if (*fi->fi_path != '/') {
prologue = srcdir; prologue = defprologue;
if (fi->fi_prefix != NULL) { if (fi->fi_prefix != NULL) {
if (*fi->fi_prefix == '/') if (*fi->fi_prefix == '/')
prologue = ""; prologue = "";
@ -319,13 +319,20 @@ emitfile(FILE *fp, struct files *fi)
static void static void
emitobjs(FILE *fp) emitobjs(FILE *fp)
{ {
const char *prologue, *prefix, *sep;
struct files *fi; struct files *fi;
fputs("OBJS= \\\n", fp); fputs("OBJS= \\\n", fp);
TAILQ_FOREACH(fi, &allfiles, fi_next) { TAILQ_FOREACH(fi, &allfiles, fi_next) {
prologue = prefix = sep = "";
if ((fi->fi_flags & FI_SEL) == 0) if ((fi->fi_flags & FI_SEL) == 0)
continue; continue;
fprintf(fp, "\t%s.o \\\n", fi->fi_base); if (fi->fi_buildprefix != NULL) {
prefix = fi->fi_buildprefix;
sep = "/";
}
fprintf(fp, "\t%s%s%s%s.o \\\n", prologue, prefix, sep,
fi->fi_base);
} }
TAILQ_FOREACH(fi, &allofiles, fi_snext) { TAILQ_FOREACH(fi, &allofiles, fi_snext) {
if ((fi->fi_flags & FI_SEL) == 0) if ((fi->fi_flags & FI_SEL) == 0)