Print this page
4027 remove CLOSED_BUILD
4028 remove CLOSED_IS_PRESENT
4029 remove tonic build bits
Reviewed by: Andy Stormont <andyjstormont@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 40 lines elided ↑ open up ↑
  41   41  NATIVE_ADJUNCT= /usr
  42   42  
  43   43  #
  44   44  # RELEASE_BUILD should be cleared for final release builds.
  45   45  # NOT_RELEASE_BUILD is exactly what the name implies.
  46   46  #
  47   47  # INTERNAL_RELEASE_BUILD is a subset of RELEASE_BUILD. It mostly controls
  48   48  # identification strings. Enabling RELEASE_BUILD automatically enables
  49   49  # INTERNAL_RELEASE_BUILD.
  50   50  #
  51      -# CLOSED_BUILD controls whether we try to build files under
  52      -# usr/closed.  ("" means to build closed code, "#" means don't try to
  53      -# build it.)  Skipping the closed code implies doing an export release
  54      -# build.
  55      -#
  56   51  # STRIP_COMMENTS toggles comment section striping. Generally the same setting
  57   52  # as INTERNAL_RELEASE_BUILD.
  58   53  #
  59   54  # __GNUC toggles the building of ON components using gcc and related tools.
  60   55  # Normally set to `#', set it to `' to do gcc build.
  61   56  #
  62   57  # The declaration POUND_SIGN is always '#'. This is needed to get around the
  63   58  # make feature that '#' is always a comment delimiter, even when escaped or
  64   59  # quoted. We use this macro expansion method to get POUND_SIGN rather than
  65   60  # always breaking out a shell because the general case can cause a noticable
↓ open down ↓ 8 lines elided ↑ open up ↑
  74   69  PRE_POUND=                              pre\#
  75   70  POUND_SIGN=                             $(PRE_POUND:pre\%=%)
  76   71  
  77   72  NOT_RELEASE_BUILD=
  78   73  INTERNAL_RELEASE_BUILD=                 $(POUND_SIGN)
  79   74  RELEASE_BUILD=                          $(POUND_SIGN)
  80   75  $(RELEASE_BUILD)NOT_RELEASE_BUILD=      $(POUND_SIGN)
  81   76  $(RELEASE_BUILD)INTERNAL_RELEASE_BUILD=
  82   77  PATCH_BUILD=                            $(POUND_SIGN)
  83   78  
  84      -# If CLOSED_IS_PRESENT is not set, assume the closed tree is present.
  85      -CLOSED_BUILD_1= $(CLOSED_IS_PRESENT:yes=)
  86      -CLOSED_BUILD=   $(CLOSED_BUILD_1:no=$(POUND_SIGN))
  87      -
  88   79  # SPARC_BLD is '#' for an Intel build.
  89   80  # INTEL_BLD is '#' for a Sparc build.
  90   81  SPARC_BLD_1=    $(MACH:i386=$(POUND_SIGN))
  91   82  SPARC_BLD=      $(SPARC_BLD_1:sparc=)
  92   83  INTEL_BLD_1=    $(MACH:sparc=$(POUND_SIGN))
  93   84  INTEL_BLD=      $(INTEL_BLD_1:i386=)
  94   85  
  95   86  STRIP_COMMENTS= $(INTERNAL_RELEASE_BUILD)
  96   87  
  97      -# Are we building tonic closedbins? Unless you have used the
  98      -# -O flag to nightly or bldenv, leave the definition of TONICBUILD
  99      -# as $(POUND_SIGN).
 100      -#
 101      -# IF YOU CHANGE CLOSEDROOT, you MUST change install.bin
 102      -# to match the new definition.
 103      -TONICBUILD=     $(POUND_SIGN)
 104      -$(TONICBUILD)CLOSEDROOT= $(ROOT)-closed
 105      -
 106      -
 107   88  # The variables below control the compilers used during the build.
 108   89  # There are a number of permutations.
 109   90  #
 110   91  # __GNUC and __SUNC control (and indicate) the primary compiler.  Whichever
 111   92  # one is not POUND_SIGN is the primary, with the other as the shadow.  They
 112   93  # may also be used to control entirely compiler-specific Makefile assignments.
 113   94  # __SUNC and Sun Studio are the default.
 114   95  #
 115   96  # __GNUC64 indicates that the 64bit build should use the GNU C compiler.
 116   97  # There is no Sun C analogue.
↓ open down ↓ 123 lines elided ↑ open up ↑
 240  221  DOT_C_CHECK=    \
 241  222          @$(ECHO) "checking $<"; $(CSTYLE) $< $(CSTYLE_TAIL)
 242  223  
 243  224  MANIFEST_CHECK= \
 244  225          @$(ECHO) "checking $<"; \
 245  226          SVCCFG_DTD=$(SRC)/cmd/svc/dtd/service_bundle.dtd.1 \
 246  227          SVCCFG_REPOSITORY=$(SRC)/cmd/svc/seed/global.db \
 247  228          SVCCFG_CONFIGD_PATH=$(SRC)/cmd/svc/configd/svc.configd-native \
 248  229          $(SRC)/cmd/svc/svccfg/svccfg-native validate $<
 249  230  
 250      -#
 251      -# IMPORTANT:: If you change any of INS.file, INS.dir, INS.rename,
 252      -# INS.link or INS.symlink here, then you must also change the
 253      -# corresponding override definitions in $CLOSED/Makefile.tonic.
 254      -# If you do not do this, then the closedbins build for the OpenSolaris
 255      -# community will break. PS, the gatekeepers will be upset too.
 256  231  INS.file=       $(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $<
 257  232  INS.dir=        $(INS) -s -d -m $(DIRMODE) $@
 258  233  # installs and renames at once
 259  234  #
 260  235  INS.rename=     $(INS.file); $(MV) $(@D)/$(<F) $@
 261  236  
 262  237  # install a link
 263  238  INSLINKTARGET=  $<
 264  239  INS.link=       $(RM) $@; $(LN) $(INSLINKTARGET) $@
 265  240  INS.symlink=    $(RM) $@; $(SYMLINK) $(INSLINKTARGET) $@
↓ open down ↓ 928 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX