Mercurial > illumos > illumos-gate
changeset 13215:25c1876a8d9c
334 "make check" fails if MULTI_PROTO is yes and only building non-debug
303 mdb's tigen should use terminfo database from proto
Reviewed by: richlowe@richlowe.net
Reviewed by: garrett@nexenta.com
Approved by: garrett@nexenta.com
| author | Albert Lee <trisk@opensolaris.org> |
|---|---|
| date | Thu, 14 Oct 2010 23:15:08 +0100 |
| parents | ffcbc62702fd |
| children | 8bfa85c99f86 |
| files | usr/src/cmd/Makefile usr/src/cmd/mdb/Makefile.kmdb.targ usr/src/tools/scripts/nightly.sh |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/Makefile Thu Oct 14 12:10:54 2010 -0700 +++ b/usr/src/cmd/Makefile Thu Oct 14 23:15:08 2010 +0100 @@ -852,6 +852,7 @@ # fs.d: fstyp ksh: shcomp isaexec +mdb: terminfo print: lp $(FIRST_SUBDIRS) $(BWOSDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC
--- a/usr/src/cmd/mdb/Makefile.kmdb.targ Thu Oct 14 12:10:54 2010 -0700 +++ b/usr/src/cmd/mdb/Makefile.kmdb.targ Thu Oct 14 23:15:08 2010 +0100 @@ -22,8 +22,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# + +ROOTTERMINFO = $(ROOTSHLIB)/terminfo $(PROG).core: $(OBJS) $(KMDBLIBS) $(MAPFILE) $(LD) -r $(BREDUCE) $(ZNOVERSION) $(ZDEFS) -M$(MAPFILE) -o $@ $(OBJS) \ @@ -54,8 +54,10 @@ # Specialized object construction # kmdb_terminfo.c: ../../../common/mdb/mdb_termio.c \ - ../../../common/kmdb/kmdb_terminfo_skel.c - $(TIGEN) -s ../../../common/kmdb/kmdb_terminfo_skel.c \ + ../../../common/kmdb/kmdb_terminfo_skel.c \ + $(ROOTTERMINFO) + TERMINFO=$(ROOTTERMINFO) $(TIGEN) -s \ + ../../../common/kmdb/kmdb_terminfo_skel.c \ -t ../../../common/mdb/mdb_termio.c \ $(SUPPORTED_TERMS) > $@
--- a/usr/src/tools/scripts/nightly.sh Thu Oct 14 12:10:54 2010 -0700 +++ b/usr/src/tools/scripts/nightly.sh Thu Oct 14 23:15:08 2010 +0100 @@ -3053,7 +3053,8 @@ rm -f $SRC/check-${MACH}.out cd $SRC - $MAKE -ek check 2>&1 | tee -a $SRC/check-${MACH}.out >> $LOGFILE + $MAKE -ek check ROOT="$checkroot" 2>&1 | tee -a $SRC/check-${MACH}.out \ + >> $LOGFILE echo "\n==== cstyle/hdrchk errors ====\n" >> $mail_msg_file grep ":" $SRC/check-${MACH}.out |