Print this page
7661 illumos should provide 64bit perl modules (for omni)

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master.64.man.txt
          +++ new/usr/src/Makefile.master.64.man.txt
↓ open down ↓ 7 lines elided ↑ open up ↑
   8    8  obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or
   9    9  http://www.opensolaris.org/os/licensing.  # See the License for the specific
  10   10  language governing permissions # and limitations under the License.  # # When
  11   11  distributing Covered Code, include this CDDL HEADER in each # file and include
  12   12  the License file at usr/src/OPENSOLARIS.LICENSE.  # If applicable, add the
  13   13  following below this CDDL HEADER, with the # fields enclosed by brackets "[]"
  14   14  replaced with your own identifying # information: Portions Copyright [yyyy]
  15   15  [name of copyright owner] # # CDDL HEADER END # # # Copyright (c) 1997, 2010,
  16   16  Oracle and/or its affiliates. All rights reserved.  # Copyright 2014 Garrett
  17   17  D'Amore <garrett@damore.org> # Copyright (c) 2014 Joyent, Inc.  All rights
  18      -reserved.  #
       18 +reserved.  # Copyright 2016 RackTop Systems.  #
  19   19  
  20   20  # rebind basic build macros to 64-bit versions
  21   21  
  22   22  CFLAGS=        $(CFLAGS64) CCFLAGS=     $(CCFLAGS64) COPTFLAG=   $(COPTFLAG64)
  23   23  CCOPTFLAG=     $(CCOPTFLAG64) COMPILE.c=     $(COMPILE64.c) COMPILE.cc=
  24   24       $(COMPILE64.cc) COMPILE.s=    $(COMPILE64.s) COMPILE.d=     $(COMPILE64.d)
  25   25  COMPILE.b=     $(COMPILE64.b) LINK.c=        $(LINK64.c) LINK.cc=
  26   26       $(LINK64.cc) LINT.c=          $(LINT64.c)
  27   27  
  28   28  CTF_FLAGS=     $(CTF_FLAGS_64)
  29   29  
  30   30  OFFSETS_CREATE=     $(OFFSETS_CREATE64)
  31   31  
  32   32  # # Moved these up to the top level here, so they can be overridden #
  33   33  LDLIBS.cmd =   $(LDLIBS64) LDLIBS.lib = $(LDLIBS64)
  34   34  
  35   35  # # Override Makefile.master's settings of GCCLIBDIR # GCCLIBDIR=
  36   36       $(GCCLIBDIR64)
  37   37  
  38   38  # # Override Makefile.master's settings of CC, CCC, AS and LINT # CC=
  39      -          $($(MACH64)_CC) CCC=          $($(MACH64)_CCC) CPP=         $($(MACH64)_CPP)
  40      -AS=       $($(MACH64)_AS) LD=      $($(MACH64)_LD) LINT=
  41      -          $($(MACH64)_LINT)
       39 +          $(CC64) CCC=        $(CCC64) CPP=       $(CPP64) AS=        $(AS64) LD=
       40 +          $(LD64) LINT=       $(LINT64)
  42   41  
  43   42  REAL_CC=  $(CW_CC_CMD:sh) REAL_CCC=     $(CW_CCC_CMD:sh)
  44   43  
  45      -BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS)           $(PICS)
  46      -$(EXTPICS) $(USDT_PICS) -L $(ROOTLIBDIR64) $(LDLIBS)
       44 +BUILD.SO= $(BUILD.SO) BUILDCCC.SO= $(BUILDCCC.SO)
  47   45  
  48   46  # # ld(1) requires the -64 option to create a 64-bit filter solely from a
  49   47  mapfile # MAPFILECLASS=  -64
  50   48  
  51      -CCNEEDED =          -lCrun $(__GNUC64)CCNEEDED =  -L$(GCCLIBDIR) -lstdc++
  52      -$(__GNUC64)CCNEEDED +=   -lgcc_s
       49 +MAPFILE.NGB =  $(MAPFILE.NGB_$(MACH64))
  53   50  
  54      -BUILDCCC.SO=    $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS)        $(PICS)
  55      -$(EXTPICS) $(LDLIBS) $(CCNEEDED) MAPFILE.NGB =    $(MAPFILE.NGB_$(MACH64))
  56   51  
  57      -
  58   52  
  59   53                                 December 13, 2016                            ()
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX