Print this page
7595 sgs native-proto fails on pre-7029 illumos-gate
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/cmd/sgs/ld/Makefile.com
+++ new/usr/src/cmd/sgs/ld/Makefile.com
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
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 #
23 23 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
24 +# Copyright 2016 RackTop Systems.
24 25 #
25 26
26 27 PROG = ld
27 28
28 29 include $(SRC)/cmd/Makefile.cmd
29 30 include $(SRC)/cmd/sgs/Makefile.com
30 31
31 32 COMOBJS = ld.o
32 33 BLTOBJ = msg.o
33 34
34 35 OBJS = $(BLTOBJ) $(COMOBJS)
35 36 .PARALLEL: $(OBJS)
36 37
37 38 MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
38 39 MAPOPTS = $(MAPFILES:%=-M%)
39 40
40 41 LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
41 42 LDLIBS += $(LDLIBDIR) $(LD_LIB) $(ELFLIBDIR) -lelf \
42 43 $(LDDBGLIBDIR) $(LDDBG_LIB) $(CONVLIBDIR) $(CONV_LIB)
43 44
44 45 CERRWARN += -_gcc=-Wno-switch
↓ open down ↓ |
11 lines elided |
↑ open up ↑ |
45 46 CERRWARN += -_gcc=-Wno-parentheses
46 47
47 48 LINTFLAGS += -x
48 49 LINTFLAGS64 += -x $(VAR_LINTFLAGS64)
49 50
50 51 CLEANFILES += $(LINTOUTS)
51 52
52 53 native := LDFLAGS = -R$(SGSPROTO) $(ZNOVERSION)
53 54 native := LDLIBS = -L$(SGSPROTO) $(LD_LIB) -lelf $(CONVLIBDIR) \
54 55 $(CONV_LIB)
56 +native := CPPFLAGS += -DNATIVE_BUILD
55 57
56 58 BLTDEFS= msg.h
57 59 BLTDATA= msg.c
58 60 BLTMESG= $(SGSMSGDIR)/ld
59 61
60 62 BLTFILES= $(BLTDEFS) $(BLTDATA) $(BLTMESG)
61 63
62 64 SGSMSGCOM= ../common/ld.msg
63 65 SGSMSGTARG= $(SGSMSGCOM)
64 66 SGSMSGALL= $(SGSMSGCOM)
65 67 SGSMSGFLAGS += -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ld_msg
66 68
67 69 SRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) $(BLTDATA)
68 70 LINTSRCS= $(SRCS) ../common/lintsup.c
69 71
70 72 CLEANFILES += $(BLTFILES)
71 73
72 74 FILEMODE= 0755
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX