summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>2008-06-29 07:15:57 +0000
committerjb <jb@FreeBSD.org>2008-06-29 07:15:57 +0000
commit081bbc17b6306d62449b08634d88106ccdad3d05 (patch)
tree1b30955cc7461f0484e5d70f290ab255703412b6 /usr.sbin
parent7d4f905059bda78c5c1924da15cb41fcd5751130 (diff)
downloadFreeBSD-src-081bbc17b6306d62449b08634d88106ccdad3d05.zip
FreeBSD-src-081bbc17b6306d62449b08634d88106ccdad3d05.tar.gz
Revice the way the CTF conversion is done per object. Avoid creating a second
shell (which was the problem with the original implementation) and avoid letting make see an empty definition (which was the problem with the current implementation).
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/config/mkmakefile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 7976fcf..b6f1f18 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -735,7 +735,7 @@ do_rules(FILE *f)
printf("config: don't know rules for %s\n", np);
break;
}
- snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t${NORMAL_CTFCONVERT}", ftype,
+ snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if defined(NORMAL_CTFCONVERT) && !empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype,
toupper(och),
ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
compilewith = cmd;
OpenPOWER on IntegriCloud