Print this page
7612 SGSPROTO lacks structure
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/sgs/libelf/Makefile.targ
          +++ new/usr/src/cmd/sgs/libelf/Makefile.targ
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  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) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
       23 +# Copyright 2016 RackTop Systems.
  23   24  #
  24   25  
  25   26  objs/%.o \
  26   27  pics/%.o:       %.c
  27   28                  $(COMPILE.c) -o $@ $<
  28   29                  $(POST_PROCESS_O)
  29   30  
  30   31  objs/%64.o \
  31   32  pics/%64.o:     ../common/%.c
  32   33                  $(COMPILE.c) -D_ELF64 -o $@ $<
↓ open down ↓ 91 lines elided ↑ open up ↑
 124  125  ###wlocks/%.ll: ../common/%.c
 125  126  ###     wlcc $(CFLAGS) $(CPPFLAGS) -o $@ $<
 126  127  ###
 127  128  ###wlocks/%64.ll:       ../common/%.c
 128  129  ###     wlcc -D_ELF64 $(CFLAGS) $(CPPFLAGS) -o $@ $<
 129  130  
 130  131  
 131  132  # Special target for native builds (ie. when we need to build a version of ld
 132  133  # to build a version of ld :-).
 133  134  
 134      -native:         $(SGSPROTO)/$(DYNLIB)
      135 +native:         $(SGSLIBDIR)/$(LIBLINKS)
 135  136  
 136      -$(SGSPROTO)/$(DYNLIB): \
 137      -                pics .WAIT $$(PICS)
      137 +$(SGSLIBDIR)/$(DYNLIB): pics .WAIT $$(PICS)
 138  138                  $(BUILD.SO)
 139  139                  $(POST_PROCESS_SO)
 140      -                -@$(RM) $(SGSPROTO)/$(LIBLINKS)
 141      -                $(SYMLINK) $(DYNLIB) $(SGSPROTO)/$(LIBLINKS)
      140 +
      141 +$(SGSLIBDIR)/$(LIBLINKS): $(SGSLIBDIR)/$(DYNLIB)
      142 +                -@$(RM) $(SGSLIBDIR)/$(LIBLINKS)
      143 +                $(SYMLINK) $(DYNLIB) $(SGSLIBDIR)/$(LIBLINKS)
 142  144  
 143  145  
 144  146  # Derived source and header files (messaging).  Make sure that the sgsmsg
 145  147  # command is constructed - libelf might not be built with the whole sgs.
 146  148  
 147  149  catalog:        $(BLTMESG)
 148  150  
 149  151  chkmsg:         $(LIBSRCS)
 150  152                  sh $(CHKMSG) $(CHKMSGFLAGS) $(LIBSRCS)
 151  153  
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX