Print this page
don't pass in lint libraries which no longer exist
gag lint errors that stem from lint libraries that the omnios build system does not build
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/cmd/boot/bootadm/Makefile
+++ new/usr/src/cmd/boot/bootadm/Makefile
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
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 2009 Sun Microsystems, Inc. All rights reserved.
23 23 # Use is subject to license terms.
24 24 #
25 25 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
26 26 #
27 27
28 28 PROG= bootadm
29 29
30 30 SBINLINKS= $(PROG)
↓ open down ↓ |
30 lines elided |
↑ open up ↑ |
31 31
32 32 OBJS= bootadm.o bootadm_upgrade.o bootadm_hyper.o
33 33 SRCS = $(OBJS:.o=.c)
34 34
35 35 include ../Makefile.com
36 36
37 37
38 38 .KEEP_STATE:
39 39
40 40 LDLIBS_i386= -lfdisk
41 -LDLIBS += -lnvpair -lgen -ladm -lefi -lscf -lz -lbe -lzfs $(LDLIBS_$(MACH))
41 +LDLIBS += -lnvpair -lgen -ladm -lefi -lscf -lbe -lzfs $(LDLIBS_$(MACH))
42 +
43 +# There's no lint library for zlib, so only include this when building
44 +$(PROG) := LDLIBS += -lz
42 45
43 46 # Writing into string literals is incorrect. We need to match gcc's
44 47 # behavior, which causes us to take SIGSEGV on such a write.
45 48 CFLAGS += $(XSTRCONST)
46 49 CPPFLAGS += -D_FILE_OFFSET_BITS=64
47 50 CPPFLAGS += -I../../../uts/common -I../../../common
48 51
49 52 CERRWARN += -_gcc=-Wno-parentheses
50 53 CERRWARN += -_gcc=-Wno-uninitialized
51 54 CERRWARN += -_gcc=-Wno-unused-label
52 55
53 56 LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
54 57 LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
55 58 LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
59 +LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
56 60
57 61 all: $(PROG)
58 62
59 63 $(PROG): $(OBJS) bootadm.h
60 64 $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
61 65 $(POST_PROCESS)
62 66
63 67 install: all $(ROOTSBINPROG) .WAIT $(ROOTUSRSBINLINKS)
64 68
65 69 clean:
66 70 -$(RM) $(OBJS)
67 71
68 72 _msg:
69 73
70 74 lint: lint_SRCS
71 75
72 76 include ../Makefile.targ
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX