Print this page
native tools must reliably use a native adjunct, even if that's inconvenient
While it is perhaps convenient for native tools to use updated versions
of certain things like libxml it is imperative that those versions are
_also_ build for the build machine.  Thus they need to be in the native
adjunct (even if that native adjunct is thus not /).
Fix the native adjunct to be rooted similarly to the adjunct proto (that
is, at /), and fix SMF to use it correctly

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35  
  36   36  #
  37   37  # Adjunct root, containing an additional proto area to be used for headers
  38   38  # and libraries.
  39   39  #
  40   40  ADJUNCT_PROTO=
  41   41  
  42   42  #
  43   43  # Adjunct for building things that run on the build machine.
  44   44  #
  45      -NATIVE_ADJUNCT= /usr
       45 +NATIVE_ADJUNCT= /
  46   46  
  47   47  #
  48   48  # RELEASE_BUILD should be cleared for final release builds.
  49   49  # NOT_RELEASE_BUILD is exactly what the name implies.
  50   50  #
  51   51  # __GNUC toggles the building of ON components using gcc and related tools.
  52   52  # Normally set to `#', set it to `' to do gcc build.
  53   53  #
  54   54  # The declaration POUND_SIGN is always '#'. This is needed to get around the
  55   55  # make feature that '#' is always a comment delimiter, even when escaped or
↓ open down ↓ 496 lines elided ↑ open up ↑
 552  552                  $(IROPTFLAG) $(CGLOBALSTATIC) $(CCNOAUTOINLINE) \
 553  553                  $(CSOURCEDEBUGFLAGS) $(CUSERFLAGS)
 554  554  
 555  555  DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\"       # For messaging.
 556  556  DTS_ERRNO=-D_TS_ERRNO
 557  557  CPPFLAGS.first= # Please keep empty.  Only lower makefiles should set this.
 558  558  CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
 559  559          $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
 560  560          $(ADJUNCT_PROTO:%=-I%/usr/include)
 561  561  CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
 562      -                $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
      562 +                $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/usr/include
 563  563  CPPFLAGS=       $(CPPFLAGS.first) $(CPPFLAGS.master)
 564  564  AS_CPPFLAGS=    $(CPPFLAGS.first) $(CPPFLAGS.master)
 565  565  JAVAFLAGS=      -source 1.6 -target 1.6 -Xlint:deprecation,-options
 566  566  
 567  567  #
 568  568  # For source message catalogue
 569  569  #
 570  570  .SUFFIXES: $(SUFFIXES) .i .po
 571  571  MSGROOT= $(ROOT)/catalog
 572  572  MSGDOMAIN= $(MSGROOT)/$(TEXT_DOMAIN)
↓ open down ↓ 601 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX