From 170832d350f27fb90dabe317d86a86e60410a569 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Thu, 14 Oct 2010 23:15:08 +0100 Subject: [PATCH] 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 --- usr/src/cmd/Makefile | 1 + usr/src/cmd/mdb/Makefile.kmdb.targ | 10 ++++++---- usr/src/tools/scripts/nightly.sh | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index dac3533bbb..bbdb4a6c14 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -852,6 +852,7 @@ _dc: $(DCSUBDIRS) # fs.d: fstyp ksh: shcomp isaexec +mdb: terminfo print: lp $(FIRST_SUBDIRS) $(BWOSDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC diff --git a/usr/src/cmd/mdb/Makefile.kmdb.targ b/usr/src/cmd/mdb/Makefile.kmdb.targ index 704a945fb1..abe7b48c75 100644 --- a/usr/src/cmd/mdb/Makefile.kmdb.targ +++ b/usr/src/cmd/mdb/Makefile.kmdb.targ @@ -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 @@ dmods: # 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) > $@ diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 17f94fad66..0a83ffa447 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -3053,7 +3053,8 @@ if [ "$i_CMD_LINE_FLAG" = "n" -a "$C_FLAG" = "y" ]; then 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 | -- 2.11.4.GIT