5595 libzpool won't build with a studio primary

          --- old/usr/src/cmd/fm/eversholt/Makefile.esc.com
          +++ new/usr/src/cmd/fm/eversholt/Makefile.esc.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  # 
  21   21  #
  22   22  # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  FMADIR = $(SRC)/cmd/fm
  27   27  EVERDIR = $(FMADIR)/eversholt
  28   28  EVERCMNSRC = $(EVERDIR)/common
  29   29  
  30   30  EFTCLASS = reader
  31   31  writer_WRTOBJ = eftwrite.o
  32   32  reader_WRTOBJ =
  33   33  
  34   34  CMNOBJS = alloc.o check.o eftread.o esclex.o io.o literals.o lut.o \
  35   35          out.o ptree.o stable.o stats.o tree.o $($(EFTCLASS)_WRTOBJ)
  36   36  
  37   37  COMMONOBJS = escparse.o $(CMNOBJS)
  38   38  COMMONSRCS = $(COMMONOBJS:%.o=$(EVERCMNSRC)/%.c)
  39   39  
  40   40  LINTSRCS = $(CMNOBJS:%.o=$(EVERCMNSRC)/%.c)
  41   41  LINTFLAGS = -mnux
  42   42  
  43   43  $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
  44   44  

  45   45  CPPFLAGS += -I$(EVERCMNSRC) -I.
  46   46  CFLAGS += $(CCVERBOSE)
  47   47  CERRWARN += -_gcc=-Wno-uninitialized
  48   48  CERRWARN += -_gcc=-Wno-unused-label
  49   49  CERRWARN += -_gcc=-Wno-parentheses
  50   50  CERRWARN += -_gcc=-Wno-switch
  51   51  
  52   52  CTFCONVO = $(CTFCONVERT_O)
  53   53  CTFMRG = $(CTFMERGE) -L VERSION -o $@ $(OBJS)
  54   54  
  55      -debug := CTFCONVO = STRIPSTABS_KEEP_STABS= $(CTFCONVERT_O)
  56      -debug := CTFMRG = STRIPSTABS_KEEP_STABS= $(CTFMERGE) -L VERSION -o $@ $(OBJS)
  57   55  debug := COPTFLAG =
  58   56  debug := COPTFLAG64 =
  59   57  
  60   58  ROOTPDIR = $(ROOT)/usr/lib/fm
  61   59  ROOTPROG = $(ROOTPDIR)/$(PROG)
  62   60  
  63   61  install: $(PROG) $(ROOTPROG)
  64   62  
  65   63  install_h: $(ROOTHDIR) $(ROOTHDRS)
  66   64  

  67   65  lint:   $(LINTSRCS)
  68   66          $(LINT.c) $(LINTSRCS) $(LDLIBS)
  69   67  
  70   68  %.o: %.c
  71   69          $(COMPILE.c) $<
  72   70          $(CTFCONVO)
  73   71  
  74   72  %.o: $(EVERCMNSRC)/%.c
  75   73          $(COMPILE.c) $<
  76   74          $(CTFCONVO)
  77   75  
  78   76  escparse.o: $(EVERCMNSRC)/escparse.y
  79   77          $(YACC) -dtv $(EVERCMNSRC)/escparse.y
  80   78          $(COMPILE.c) -DYYDEBUG -c -o $@ y.tab.c
  81   79          $(CTFCONVO)
  82   80  
  83   81  $(ROOT)/usr/lib/fm:
  84   82          $(INS.dir)
  85   83  
  86   84  $(ROOTPDIR): $(ROOT)/usr/lib/fm
  87   85          $(INS.dir)
  88   86  
  89   87  $(ROOTPDIR)/%: %
  90   88          $(INS.file)
  91   89  

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX