Print this page
native tools must reliably use a native adjunct, even if that's inconvenient
While it is perhaps convenient for native tools to use updated versions
of certain things like libxml it is imperative that those versions are
_also_ build for the build machine. Thus they need to be in the native
adjunct (even if that native adjunct is thus not /).
Fix the native adjunct to be rooted similarly to the adjunct proto (that
is, at /), and fix SMF to use it correctly
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/tools/ctf/Makefile.ctf
+++ new/usr/src/tools/ctf/Makefile.ctf
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 2006 Sun Microsystems, Inc. All rights reserved.
23 23 # Use is subject to license terms.
24 24 #
25 25
26 26 include ../../../Makefile.tools
27 27
28 28 #
29 29 # A `make install' from the tools directory needs to work, even if the rest of
30 30 # the tree hasn't been built. As such, we need to tell the ctf builds how
31 31 # to find the ctf specific headers located outside the tools subtree. We also
32 32 # want to tell them how to get to the common tools source files.
33 33 #
↓ open down ↓ |
33 lines elided |
↑ open up ↑ |
34 34 # For additonal details on the ordering of includes via -I, see the comments
35 35 # in $(SRC)/tools/ctf/common/ctf_headers.h.
36 36 #
37 37
38 38 HDRDIRS= \
39 39 -_gcc=-nostdinc \
40 40 -I../../common \
41 41 -I$(SRC) \
42 42 -I/usr/include \
43 43 -I$(SRC)/uts/common \
44 - -I$(NATIVE_ADJUNCT)/include
44 + -I$(NATIVE_ADJUNCT)/usr/include
45 45
46 46 CPPFLAGS += $(HDRDIRS)
47 47 CFLAGS += $(CCVERBOSE)
48 48 CERRWARN += -_gcc=-Wno-parentheses
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX