Print this page
8411 Build should warn when linking against libraries outside proto area
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libzpool/Makefile.com
+++ new/usr/src/lib/libzpool/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
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
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) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 # Copyright (c) 2013, 2015 by Delphix. All rights reserved.
24 24 # Copyright 2017 Joyent, Inc.
25 +# Copyright 2017 RackTop Systems.
25 26 #
26 27
27 28 LIBRARY= libzpool.a
28 29 VERS= .1
29 30
30 31 # include the list of ZFS sources
31 32 include ../../../uts/common/Makefile.files
32 33 KERNEL_OBJS = kernel.o taskq.o util.o
33 34 DTRACE_OBJS = zfs.o
34 35
35 36 OBJECTS=$(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS)
36 37
37 38 # include library definitions
38 39 include ../../Makefile.lib
39 40
40 41 ZFS_COMMON_SRCS= $(ZFS_COMMON_OBJS:%.o=../../../uts/common/fs/zfs/%.c)
41 42 ZFS_SHARED_SRCS= $(ZFS_SHARED_OBJS:%.o=../../../common/zfs/%.c)
42 43 KERNEL_SRCS= $(KERNEL_OBJS:%.o=../common/%.c)
43 44
44 45 SRCS=$(ZFS_COMMON_SRCS) $(ZFS_SHARED_SRCS) $(KERNEL_SRCS)
45 46 SRCDIR= ../common
46 47
47 48 # There should be a mapfile here
48 49 MAPFILES =
49 50
50 51 LIBS += $(LINTLIB) $(DYNLIB)
51 52
52 53 INCS += -I../common
53 54 INCS += -I../../../uts/common/fs/zfs
54 55 INCS += -I../../../common/zfs
55 56 INCS += -I../../../common
56 57
57 58 CLEANFILES += ../common/zfs.h
58 59 CLEANFILES += $(EXTPICS)
59 60
60 61 $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
|
↓ open down ↓ |
26 lines elided |
↑ open up ↑ |
61 62 $(LINTLIB): ../common/zfs.h
62 63
63 64 C99MODE= -xc99=%all
64 65 C99LMODE= -Xc99=%all
65 66
66 67 CFLAGS += -g $(CCVERBOSE) $(CNOGLOBAL)
67 68 CFLAGS64 += -g $(CCVERBOSE) $(CNOGLOBAL)
68 69 LDLIBS += -lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd
69 70 CPPFLAGS += $(INCS) -DDEBUG
70 71
72 +# Allow zlib to be taken from outside the proto area.
73 +$(ADJUNCT_PROTO_NOT_SET)DYNFLAGS += $(ZASSERTDEFLIB)=libz.so
74 +
71 75 CERRWARN += -_gcc=-Wno-parentheses
72 76 CERRWARN += -_gcc=-Wno-switch
73 77 CERRWARN += -_gcc=-Wno-type-limits
74 78 CERRWARN += -_gcc=-Wno-unused-variable
75 79 CERRWARN += -_gcc=-Wno-empty-body
76 80 CERRWARN += -_gcc=-Wno-unused-function
77 81 CERRWARN += -_gcc=-Wno-unused-label
78 82
79 83 .KEEP_STATE:
80 84
81 85 all: $(LIBS)
82 86
83 87 lint: $(LINTLIB)
84 88
85 89 include ../../Makefile.targ
86 90
87 91 EXTPICS= $(DTRACE_OBJS:%=pics/%)
88 92
89 93 pics/%.o: ../../../uts/common/fs/zfs/%.c ../common/zfs.h
90 94 $(COMPILE.c) -o $@ $<
91 95 $(POST_PROCESS_O)
92 96
93 97 pics/%.o: ../../../common/zfs/%.c ../common/zfs.h
94 98 $(COMPILE.c) -o $@ $<
95 99 $(POST_PROCESS_O)
96 100
97 101 pics/%.o: ../common/%.d $(PICS)
98 102 $(COMPILE.d) -C -s $< -o $@ $(PICS)
99 103 $(POST_PROCESS_O)
100 104
101 105 ../common/%.h: ../common/%.d
102 106 $(DTRACE) -xnolibs -h -s $< -o $@
|
↓ open down ↓ |
22 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX