11224 nightly and bldenv should be usable directly

*** 18,27 ****
--- 18,28 ----
  #
  # CDDL HEADER END
  #
  #
  # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2020 Joyent, Inc.
  #
  # Definitions common to tool source.
  #
  include $(SRC)/Makefile.master
  
*** 58,67 ****
--- 59,69 ----
  # Unset CW_LINKER so we run the default.  We don't set LD here to avoid taking
  # the journey through LD_ALTEXEC unnecessarily.
  CW_LINKER=
  
  ROOTONBLDPROG=          $(PROG:%=$(ROOTONBLDBIN)/%)
+ ROOTONBLDSCRIPTS=       $(SCRIPTS:%=$(ROOTONBLDBIN)/%)
  ROOTONBLDMACHPROG=      $(PROG:%=$(ROOTONBLDBINMACH)/%)
  ROOTONBLDSHFILES=       $(SHFILES:%=$(ROOTONBLDBIN)/%)
  ROOTONBLDMAKEFILES=     $(MAKEFILES:%=$(ROOTONBLDBIN)/%)
  ROOTONBLDMACHSHFILES=   $(SHFILES:%=$(ROOTONBLDBINMACH)/%)
  ROOTONBLDMACHBINARIES=  $(BINARIES:%=$(ROOTONBLDBINMACH)/%)