diff options
author | netchild <netchild@FreeBSD.org> | 2010-04-22 09:20:17 +0000 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2010-04-22 09:20:17 +0000 |
commit | ec68a94632f90227249393eaa8f36f3a22a91393 (patch) | |
tree | bd5c2d585b130a910219a8e6e320fdb7c35237aa | |
parent | 20eaac12a517074806a249fd85baec91d92ac1ef (diff) | |
download | FreeBSD-src-ec68a94632f90227249393eaa8f36f3a22a91393.zip FreeBSD-src-ec68a94632f90227249393eaa8f36f3a22a91393.tar.gz |
Revert r206179 (by imp) and do something similar which is more consistent
with all other corresponding CTF places by changing the corresponding
code which is generated by config(8). Or in short, move the '@' from
the variable definition to the use of the variable. [1]
While I'm here break up a long line. [2]
Discussed with: imp [1,2], bde [2]
-rw-r--r-- | sys/conf/kern.pre.mk | 3 | ||||
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index d55b379..b70f5f1 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -128,7 +128,8 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \ ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c -NORMAL_CTFCONVERT= @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index f0d37fa..7845089 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -741,7 +741,7 @@ do_rules(FILE *f) printf("config: don't know rules for %s\n", np); break; } - snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if defined(NORMAL_CTFCONVERT) && !empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype, + snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t@${NORMAL_CTFCONVERT}", ftype, toupper(och), ftp->f_flags & NOWERROR ? "_NOWERROR" : ""); compilewith = cmd; |