Print this page
1681 support for BUILD64=# no longer works

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/Makefile
          +++ new/usr/src/lib/libc/Makefile
↓ open down ↓ 16 lines elided ↑ open up ↑
  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) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  #
  24   24  # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
       27 +# Copyright 2014 Andrew Stormont.
       28 +#
  27   29  
  28   30  LIBBASENAME=    libc
  29   31  LIBRARY=        $(LIBBASENAME:%=%.a)
  30   32  VERS=           .1
  31   33  
  32   34  # Note that we build libc_pic.a for the benefit of building
  33   35  # ld.so.1, but we do not install it.  Only ld.so.1 needs it
  34   36  # and it must be built in the same workspace as libc.
  35   37  LIB_PIC= libc_pic.a
  36   38  
↓ open down ↓ 85 lines elided ↑ open up ↑
 122  124  $(ROOTVARIANTDIR)                       := FILEMODE= 755
 123  125  $(ROOTVARIANTDIR)/$(VAR1_DYNLIB)        := FILEMODE= 755
 124  126  $(ROOTVARIANTDIR)/$(VAR2_DYNLIB)        := FILEMODE= 755
 125  127  $(ROOTVARIANTDIR)/$(VAR3_DYNLIB)        := FILEMODE= 755
 126  128  
 127  129  $(ROOTVARIANTDIR64)                     := FILEMODE= 755
 128  130  $(ROOTVARIANTDIR64)/$(VAR1_DYNLIB64)    := FILEMODE= 755
 129  131  
 130  132  .KEEP_STATE:
 131  133  
 132      -all:    all_h lib32 $(BUILD64) .WAIT lib64 .WAIT etc THIRDPARTYLICENSE
      134 +all:    all_h lib .WAIT etc THIRDPARTYLICENSE
 133  135  
 134  136  THIRDPARTYLICENSE: extract-copyright
 135  137          $(RM) $@
 136  138          ./extract-copyright . > $@
 137  139  
 138  140  etc:    $($(MACH)_ETC)
 139  141  
 140  142  lib32:  $(MACH_COMP) $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS)
 141  143          @if $(ELFDUMP) -r $(MACH)/$(DYNLIB) | $(GREP) -w environ ; then \
 142  144                  $(ECHO) "Error: Invalid reference to environ" ; \
↓ open down ↓ 1 lines elided ↑ open up ↑
 144  146                  exit 1; \
 145  147          fi
 146  148  
 147  149  lib64:  $(MACH_COMP) $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64)
 148  150          @if $(ELFDUMP) -r $(MACH64)/$(DYNLIB) | $(GREP) -w environ ; then \
 149  151                  $(ECHO) "Error: Invalid reference to environ" ; \
 150  152                  $(ECHO) "Error: See comments in port/gen/env_data.c" ; \
 151  153                  exit 1; \
 152  154          fi
 153  155  
      156 +lib: lib32 $(BUILD64) .WAIT lib64
      157 +
 154  158  $(MACH)/assym.h $(MACH64)/assym.h:
 155  159          @cd $(@D); $(MAKE) assym.h
 156  160  
 157  161  $(VARIANTLIBS): FRC
 158  162          @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F)
 159  163  
 160  164  $(VARIANTLIBS64): FRC
 161  165          @cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F)
 162  166  
 163  167  $($(MACH)_ETC): FRC
 164  168          @cd $(@); pwd; $(MAKE) $(TARGET)
 165  169  
 166  170  $($(MACH)_COMP): FRC
 167  171          @cd $(@); pwd; $(MAKE) $(TARGET)
 168  172  
 169      -install:        all                     \
 170      -                etc                     \
 171      -                inslib32                \
 172      -                $(BUILD64) inslib64
      173 +install:        all etc inslib
 173  174  
 174  175  inslib32:       $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTFS_LINT) \
 175  176                  $(ROOTFS_LINTLIB) \
 176  177                  $(ROOTVARIANTLIBS)
 177  178  
 178  179  inslib64:       $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \
 179  180                  $(ROOTFS_LINTLIB64) \
 180  181                  $(ROOTVARIANTLIBS64)
 181  182  
      183 +inslib: inslib32 $(BUILD64) inslib64
      184 +
 182  185  install_h: all_h $(ROOTHDRS)
 183  186  
 184      -all_h:  $(MACH)/assym.h $(MACH64)/assym.h
      187 +all_h:  $(MACH)/assym.h $(BUILD64) $(MACH64)/assym.h
 185  188  
 186  189  check:  $(CHECKHDRS)
 187  190  
 188  191  $(ROOTFS_LIB)/%: $(MACH)/%
 189  192          $(INS.file)
 190  193  $(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
 191  194          $(INS.liblink)
 192  195  $(ROOTFS_LIB64)/%: $(MACH64)/%
 193  196          $(INS.file)
 194  197  $(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
↓ open down ↓ 68 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX