11224 nightly and bldenv should be usable directly

          --- old/usr/src/tools/Makefile.tools
          +++ new/usr/src/tools/Makefile.tools

   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 (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
       23 +# Copyright 2020 Joyent, Inc.
  23   24  #
  24   25  # Definitions common to tool source.
  25   26  #
  26   27  include $(SRC)/Makefile.master
  27   28  
  28   29  FILEMODE=       0555
  29   30  
  30   31  TOOLS=                  $(SRC)/tools
  31   32  TOOLS_PROTO=            $(TOOLS)/proto/root_$(MACH)-nd
  32   33  ROOTOPT=                $(TOOLS_PROTO)/opt

  33   34  ROOTONBLD=              $(ROOTOPT)/onbld
  34   35  ROOTONBLDBIN=           $(ROOTONBLD)/bin
  35   36  ROOTONBLDBINMACH=       $(ROOTONBLD)/bin/$(MACH)
  36   37  ROOTONBLDETC=           $(ROOTONBLD)/etc
  37   38  ROOTONBLDLIB=           $(ROOTONBLD)/lib
  38   39  ROOTONBLDLIBMACH=       $(ROOTONBLD)/lib/$(MACH)
  39   40  ROOTONBLDLIBMACH64=     $(ROOTONBLD)/lib/$(MACH)/64
  40   41  ROOTONBLDLIBPERL=       $(ROOTONBLD)/lib/perl
  41   42  ROOTONBLDLIBPY=         $(ROOTONBLD)/lib/python
  42   43  ROOTONBLDENV=           $(ROOTONBLD)/env
  43   44  ROOTONBLDMAN=           $(ROOTONBLD)/man
  44   45  ROOTONBLDMAN1ONBLD=     $(ROOTONBLD)/man/man1onbld
  45   46  ROOTONBLDETCABI=        $(ROOTONBLD)/etc/abi
  46   47  ROOTONBLDETCEXCEPT=     $(ROOTONBLD)/etc/exception_lists
  47   48  ROOTONBLDSHARE=         $(ROOTONBLD)/share
  48   49  
  49   50  CC =                    $(NATIVECC)
  50   51  CCC =                   $(NATIVECCC)
  51   52  CFLAGS =                $(NATIVE_CFLAGS)
  52   53  CPPFLAGS=               -D_TS_ERRNO

  53   54  ELFSIGN_O=              $(TRUE)
  54   55  LDLIBS=
  55   56  LDFLAGS=                $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) \
  56   57                              $(MAPFILE.PGA:%=-M%)
  57   58  
  58   59  # Unset CW_LINKER so we run the default.  We don't set LD here to avoid taking
  59   60  # the journey through LD_ALTEXEC unnecessarily.
  60   61  CW_LINKER=
  61   62  
  62   63  ROOTONBLDPROG=          $(PROG:%=$(ROOTONBLDBIN)/%)
       64 +ROOTONBLDSCRIPTS=       $(SCRIPTS:%=$(ROOTONBLDBIN)/%)
  63   65  ROOTONBLDMACHPROG=      $(PROG:%=$(ROOTONBLDBINMACH)/%)
  64   66  ROOTONBLDSHFILES=       $(SHFILES:%=$(ROOTONBLDBIN)/%)
  65   67  ROOTONBLDMAKEFILES=     $(MAKEFILES:%=$(ROOTONBLDBIN)/%)
  66   68  ROOTONBLDMACHSHFILES=   $(SHFILES:%=$(ROOTONBLDBINMACH)/%)
  67   69  ROOTONBLDMACHBINARIES=  $(BINARIES:%=$(ROOTONBLDBINMACH)/%)
  68   70  ROOTONBLDETCFILES=      $(ETCFILES:%=$(ROOTONBLDETC)/%)
  69   71  ROOTONBLDENVFILES=      $(ENVFILES:%=$(ROOTONBLDENV)/%)
  70   72  ROOTONBLDPERLFILES=     $(PERLFILES:%=$(ROOTONBLDBIN)/%)
  71   73  ROOTONBLDPERLMODULES=   $(PERLMODULES:%=$(ROOTONBLDLIBPERL)/%)
  72   74  ROOTONBLDPYFILES=       $(PYFILES:%=$(ROOTONBLDBIN)/%)

  73   75  ROOTONBLDMAN1ONBLDFILES=$(MAN1ONBLDFILES:%=$(ROOTONBLDMAN1ONBLD)/%)
  74   76  ROOTONBLDABIAUDITFILES= $(ABI_AUDITFILES:%=$(ROOTONBLDETCABI)/%)
  75   77  ROOTONBLDEXCEPTFILES=   $(EXCEPTFILES:%=$(ROOTONBLDETCEXCEPT)/%)
  76   78  
  77   79  # Break a chicken-and-egg dependency cycle for the tools build
  78   80  SCCSCHECK=@echo would sccscheck
  79   81  
  80   82  $(ROOTONBLDETCABI)/%: %
  81   83          $(INS.file)
  82   84  
  83   85  $(ROOTONBLDETCEXCEPT)/%: $(CODEMGR_WS)/exception_lists/%
  84   86          $(INS.file)
  85   87  
  86   88  $(ROOTONBLDBIN)/%: %
  87   89          $(INS.file)
  88   90  
  89   91  $(ROOTONBLDBINMACH)/%: %
  90   92          $(INS.file)
  91   93  
  92   94  $(ROOTONBLDETC)/%: %
  93   95          $(INS.file)
  94   96  
  95   97  $(ROOTONBLDLIBPERL)/%: %
  96   98          $(INS.file)
  97   99  
  98  100  $(ROOTONBLDMAN1ONBLD)/%: %
  99  101          $(INS.file)
 100  102  
 101  103  $(ROOTONBLDENV)/%: %
 102  104          $(INS.file)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX