Mercurial > illumos > illumos-gate

changeset 14142:20c0ad5cefdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3915 Add adjuncts support to the build Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Dan McDonald <danmcd@nexenta.com>
author Keith M Wesolowski <wesolows@foobazco.org>
date Wed, 17 Jul 2013 17:05:07 -0700
parents 85a6c280af72
children 42d090a37218
files usr/src/Makefile.master usr/src/Makefile.master.64 usr/src/cmd/availdevs/Makefile usr/src/cmd/avs/dsstat/Makefile usr/src/cmd/cmd-crypto/kmfcfg/Makefile usr/src/cmd/cmd-crypto/pktool/Makefile usr/src/cmd/cmd-crypto/tpmadm/Makefile usr/src/cmd/dfs.cmds/sharemgr/Makefile.com usr/src/cmd/fm/modules/common/fabric-xlate/Makefile usr/src/cmd/hal/Makefile.hal usr/src/cmd/isns/isnsadm/Makefile usr/src/cmd/isns/isnsd/Makefile usr/src/cmd/latencytop/Makefile.com usr/src/cmd/lvm/metassist/controller/Makefile usr/src/cmd/lvm/metassist/xml/Makefile usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile usr/src/cmd/svc/configd/Makefile usr/src/cmd/svc/svccfg/Makefile usr/src/cmd/zonestat/zonestatd/Makefile usr/src/lib/efcode/interpreter/Makefile usr/src/lib/fm/libldom/Makefile.com usr/src/lib/fm/topo/libtopo/Makefile.com usr/src/lib/libbrand/Makefile.com usr/src/lib/libkmf/ber_der/Makefile.com usr/src/lib/libkmf/libkmf/Makefile.com usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com usr/src/lib/libldap5/Makefile.com usr/src/lib/libldap5/amd64/Makefile usr/src/lib/libldap5/i386/Makefile usr/src/lib/libldap5/sparc/Makefile usr/src/lib/libldap5/sparcv9/Makefile usr/src/lib/libpool/Makefile.com usr/src/lib/libshare/Makefile.com usr/src/lib/libshare/autofs/Makefile.com usr/src/lib/libshare/nfs/Makefile.com usr/src/lib/libshare/smb/Makefile.com usr/src/lib/libshare/smbfs/Makefile.com usr/src/lib/libsldap/Makefile.com usr/src/lib/libzonecfg/Makefile.com usr/src/lib/lvm/libsvm/Makefile.com usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com usr/src/lib/policykit/Makefile.policykit usr/src/lib/pylibbe/Makefile.com usr/src/lib/pysolaris/Makefile.com usr/src/lib/pyzfs/Makefile.com usr/src/tools/ctf/Makefile.ctf usr/src/tools/ctf/cvt/Makefile.com usr/src/tools/ctf/dump/Makefile.com usr/src/tools/scripts/nightly.sh usr/src/uts/intel/tpm/Makefile usr/src/uts/sun4v/tpm/Makefile
diffstat 53 files changed, 106 insertions(+), 83 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Makefile.master	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/Makefile.master	Wed Jul 17 17:05:07 2013 -0700
@@ -30,6 +30,17 @@
 ROOT=		/proto
 
 #
+# Adjunct root, containing an additional proto area to be used for headers
+# and libraries.
+#
+ADJUNCT_PROTO=
+
+#
+# Adjunct for building things that run on the build machine.
+#
+NATIVE_ADJUNCT=	/usr
+
+#
 # RELEASE_BUILD should be cleared for final release builds.
 # NOT_RELEASE_BUILD is exactly what the name implies.
 #
@@ -571,8 +582,10 @@
 DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\"	# For messaging.
 DTS_ERRNO=-D_TS_ERRNO
 CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
-	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
-CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
+	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
+	$(ADJUNCT_PROTO:%=-I%/usr/include)
+CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
+		$(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
 CPPFLAGS=	$(CPPFLAGS.master)
 AS_CPPFLAGS=	$(CPPFLAGS.master)
 JAVAFLAGS=	-deprecation
@@ -684,6 +697,7 @@
 #	LDLIBS64=-YP,$ROOT/lib/$MACH64:$ROOT/usr/lib/$MACH64
 #
 LDLIBS32 =	$(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3)
+LDLIBS32 +=	$(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib)
 LDLIBS.cmd = 	$(LDLIBS32)
 LDLIBS.lib =	$(LDLIBS32)
 #
@@ -708,7 +722,7 @@
 #
 CCNEEDED		= -lC
 CCEXTNEEDED		= -lCrun -lCstd
-$(__GNUC)CCNEEDED	= -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s
+$(__GNUC)CCNEEDED	= -L$(GCCLIBDIR) -lstdc++ -lgcc_s
 $(__GNUC)CCEXTNEEDED	= $(CCNEEDED)
 
 LINK.c=		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
--- a/usr/src/Makefile.master.64	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/Makefile.master.64	Wed Jul 17 17:05:07 2013 -0700
@@ -49,6 +49,7 @@
 LDLIBS2=	$(ENVLDLIBS2:%=%/$(MACH64))
 LDLIBS3=	$(ENVLDLIBS3:%=%/$(MACH64))
 LDLIBS64 = 	$(LDLIBS1) $(LDLIBS2) $(LDLIBS3)
+LDLIBS64 +=	$(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64))
 #
 # Moved these up to the top level here, so they can be overridden
 #
@@ -83,7 +84,7 @@
 MAPFILECLASS=	-64
 
 CCNEEDED =		-lCrun
-$(__GNUC64)CCNEEDED =	-L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++
+$(__GNUC64)CCNEEDED =	-L$(GCCLIBDIR) -lstdc++
 $(__GNUC64)CCNEEDED +=	-lgcc_s
 
 BUILDCCC.SO=    $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \
--- a/usr/src/cmd/availdevs/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/availdevs/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 PROG=		availdevs
 
@@ -32,7 +30,7 @@
 
 ROOTCMDDIR=	$(ROOTLIB)/zfs
 
-INCS += -I/usr/include/libxml2
+INCS += -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 #
 # There is no lint library for libxml2, so we need to avoid linking against
--- a/usr/src/cmd/avs/dsstat/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/avs/dsstat/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -44,7 +44,7 @@
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-clobbered
-LDLIBS += -L/usr/lib -lkstat
+LDLIBS += -lkstat
 LINTFLAGS += -Xa -n -s -x -m -u -Dlint -errhdr=%user
 LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 LINTDIR = $(KBASE)/lintdir
--- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -47,7 +47,8 @@
 POFILE		= $(PROG)_msg.po
 MSGFILES	= $(SRCS:%.c=%.i)
 
-CPPFLAGS	+= -I/usr/include/libxml2 -I$(KMFDIR)/include -I.
+CPPFLAGS	+= -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+		-I$(KMFDIR)/include -I.
 LDLIBS		+= -L$(ROOT)/usr/lib -lkmf -lcryptoutil
 XMLLIB		= -lxml2
 
--- a/usr/src/cmd/cmd-crypto/pktool/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/cmd-crypto/pktool/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -48,7 +48,7 @@
 POFILE = $(PROG)_msg.po
 MSGFILES=$(SRCS:%.c=%.i)
 
-CPPFLAGS += -I. -I$(KMFDIR)/include -I/usr/include/libxml2 \
+CPPFLAGS += -I. -I$(KMFDIR)/include -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
 	-I$(KMFDIR)/ber_der/inc
 
 CFLAGS += $(CCVERBOSE) -DDEBUG
--- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -35,7 +35,7 @@
 MSGFILES=$(SRCS:%.c=%.i)
 
 CPPFLAGS += -xCC
-LINTFLAGS += -XCC  -L/usr/lib
+LINTFLAGS += -XCC  -L$(ADJUNCT_PROTO)/usr/lib
 LDLIBS += -ltspi -luuid
 
 .KEEP_STATE:
--- a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -35,7 +35,8 @@
 OBJS	= sharemgr_main.o commands.o shareutil.o
 SRCS	= $(OBJS:%.o=../%.c)
 
-MYCPPFLAGS = -I../../../../lib/libfsmgt/common -I/usr/include/libxml2 \
+MYCPPFLAGS = -I../../../../lib/libfsmgt/common \
+	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
 		-I../..
 CPPFLAGS += $(MYCPPFLAGS)
 LDLIBS += -lshare -lscf -lsecdb -lumem
--- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -29,7 +29,7 @@
 
 include ../../Makefile.plugin
 
-CPPFLAGS += -I/usr/include/libxml2 -I$(KMFDIR)/include -I.
+CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(KMFDIR)/include -I.
 CPPFLAGS += -I$(SRC)/uts/sun4v/io/px
 INCDIRS = $(SRC)/uts/common
 CFLAGS += -I$(INCDIRS)
--- a/usr/src/cmd/hal/Makefile.hal	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/hal/Makefile.hal	Wed Jul 17 17:05:07 2013 -0700
@@ -53,10 +53,13 @@
 			-DHAL_USER=\"$(HAL_USER)\" \
 			-DHAL_GROUP=\"$(HAL_GROUP)\"
 
-HAL_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE -DDBUS_SYSTEMD_DIR=\"/etc/dbus-1/system.d\" \
-			 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
+HAL_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE \
+			-DDBUS_SYSTEMD_DIR=\"/etc/dbus-1/system.d\" \
+			-I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \
+			-I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include
 
-HAL_GLIB_CPPFLAGS = 	-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+HAL_GLIB_CPPFLAGS = 	-I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
+			-I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
 
 HAL_GETTEXT_PACKAGE =	$(TEXT_DOMAIN)
 
--- a/usr/src/cmd/isns/isnsadm/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/isns/isnsadm/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -31,7 +31,7 @@
 
 LDLIBS += -lxml2 -lscf -lc
 CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -I. -I/usr/include/libxml2 -I../isnsd
+CPPFLAGS += -I. -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I../isnsd
 POFILE = isnsadm_all.po
 POFILES = $(OBJS:%.o=%.po)
 
--- a/usr/src/cmd/isns/isnsd/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/isns/isnsd/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -51,7 +51,7 @@
 $(ROOTSVCNETWORK)/isns_server.xml	:= FILEMODE = 0444
 
 CFLAGS 		+=	$(CCVERBOSE)
-CPPFLAGS 	+= -I./ -I/usr/include/libxml2
+CPPFLAGS 	+= -I./ -I$(ADJUNCT_PROTO)/usr/include/libxml2
 CPPFLAGS	+= -DTARGET_DATA_STORE=$(DATA_STORE)
 CPPFLAGS	+= -D_POSIX_PTHREAD_SEMANTICS
 LINTFLAGS += -xerroff=E_BAD_PTR_CAST_ALIGN
--- a/usr/src/cmd/latencytop/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/latencytop/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -34,7 +34,8 @@
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
-CPPFLAGS += -DEMBED_CONFIGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
+	-I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
 C99MODE = $(C99_ENABLE)
 LDLIBS += -lcurses -ldtrace
 all install	:= LDLIBS += -lglib-2.0
--- a/usr/src/cmd/lvm/metassist/controller/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/lvm/metassist/controller/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 METASSIST_TOPLEVEL = ..
 
@@ -36,7 +34,7 @@
 include $(METASSIST_TOPLEVEL)/Makefile.env
 
 INCLUDES += -I.. -I../common -I../xml -I../layout \
-            -I/usr/include/libxml2
+	-I$(ADJUNCT_PROTO)/usr/include/libxml2
 CFLAGS   += $(INCLUDES)
 
 POFILE = controllerp.po
--- a/usr/src/cmd/lvm/metassist/xml/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/lvm/metassist/xml/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 METASSIST_TOPLEVEL = ..
 
@@ -35,7 +33,7 @@
 include $(METASSIST_TOPLEVEL)/../../Makefile.cmd
 include $(METASSIST_TOPLEVEL)/Makefile.env
 
-INCLUDES += -I /usr/include/libxml2 -I../common
+INCLUDES += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I../common
 CFLAGS   += $(INCLUDES)
 
 POFILE = xmlp.po
--- a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -34,6 +34,8 @@
 include ../../Makefile.ia32
 include ../../../Makefile.module
 
+$(__GNUC)CPPFLAGS +=	-isystem $(ADJUNCT_PROTO)/usr/include
+
 dmod/$(MODULE) := LDLIBS += -lproc
 
 %.o: $(MODSRCS_DIR)/%.c
--- a/usr/src/cmd/svc/configd/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/svc/configd/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -75,7 +75,8 @@
 $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
 $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
 $(NATIVE_BUILD)LDFLAGS =
-$(NATIVE_BUILD)LDLIBS = -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
+$(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
+			-L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
 
 DIRMODE = 0755
 FILEMODE = 0555
--- a/usr/src/cmd/svc/svccfg/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/svc/svccfg/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -69,7 +69,7 @@
 MAPFILES +=	$(MAPFILE.LEX) $(MAPFILE.NGB)
 MAPOPTS =	$(MAPFILES:%=-M%)
 
-MYCPPFLAGS =	-I ../common -I/usr/include/libxml2
+MYCPPFLAGS =	-I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2
 CPPFLAGS +=	$(MYCPPFLAGS)
 LDFLAGS +=	$(MAPOPTS)
 
@@ -113,6 +113,7 @@
 $(NATIVE_BUILD)LDLIBS = \
 	-L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
 	-L$(LIBSCF)/native -R $(LIBSCF)/native \
+	-L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
 	$(SVCCFG_EXTRA_LIBS)
 
 svccfg_lex.o svccfg_grammar.o := CCVERBOSE =
--- a/usr/src/cmd/zonestat/zonestatd/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/cmd/zonestat/zonestatd/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -33,7 +33,7 @@
 
 SRCS =	zonestatd.c
 
-CPPFLAGS	+= -I/usr/include/libxml2
+CPPFLAGS	+= -I$(ADJUNCT_PROTO)/usr/include/libxml2
 LDLIBS 		+= -lkstat -lpool -lexacct -lscf \
 		    -lcontract -lcmdutils -lumem
 
--- a/usr/src/lib/efcode/interpreter/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/efcode/interpreter/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -39,7 +39,8 @@
 LDFLAGS += -R/usr/lib/efcode/$(MACH64) -M mapfile64
 
 LIBS	= fcode.so fcdriver.so
-$(PROG) := LDLIBS += -L/usr/lib/efcode/$(MACH64) $(LIBS:%=$(EFCODEDIR64)/%)
+$(PROG) := LDLIBS += -L$(ADJUNCT_PROTO)/usr/lib/efcode/$(MACH64) \
+	$(LIBS:%=$(EFCODEDIR64)/%)
 
 all: $(PROG)
 
--- a/usr/src/lib/fm/libldom/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/fm/libldom/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -38,7 +38,7 @@
 LIBS = $(DYNLIB) $(LINTLIB)
 
 CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \
-	-I/usr/include/libxml2 -I/usr/sfw/include
+	-I$(ADJUNCT_PROTO)/usr/include/libxml2
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -74,7 +74,7 @@
 
 CLEANFILES += $(SRCDIR)/topo_error.c $(SRCDIR)/topo_tables.c
 
-CPPFLAGS += -I../common -I/usr/include/libxml2 -I.
+CPPFLAGS += -I../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
--- a/usr/src/lib/libbrand/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libbrand/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -22,7 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 LIBRARY=	libbrand.a
 VERS=		.1
@@ -34,7 +33,7 @@
 LIBS=		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
-CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
 $(DYNLIB) :=	LDLIBS += -lxml2
 
 SRCDIR=		../common
--- a/usr/src/lib/libkmf/ber_der/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libkmf/ber_der/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -43,8 +43,10 @@
 
 CFLAGS		+=	$(CCVERBOSE) -xCC
 CFLAGS64	+=	$(CCVERBOSE) -xCC
-CPPFLAGS	+=	-I/usr/include/libxml2 -I$(INCDIR) -I../../include
-CPPFLAGS64	+=	-I/usr/include/libxml2 -I$(INCDIR) -I../../include
+CPPFLAGS	+=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I$(INCDIR) -I../../include
+CPPFLAGS64	+=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I$(INCDIR) -I../../include
 LDLIBS		+=	-lc
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
--- a/usr/src/lib/libkmf/libkmf/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -63,7 +63,8 @@
 $(DYNLIB) :=    LDLIBS += -lxml2
 $(DYNLIB64) :=  LDLIBS64 += -lxml2
 
-CPPFLAGS	+=	-I$(INCDIR) -I/usr/include/libxml2 -I../../ber_der/inc -I$(SRCDIR)
+CPPFLAGS	+=	-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+			-I../../ber_der/inc -I$(SRCDIR)
 
 CERRWARN	+=	-_gcc=-Wno-parentheses
 CERRWARN	+=	-_gcc=-Wno-switch
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -34,19 +34,21 @@
 
 MPSDIR=		/usr/lib/mps
 KMFINC=		-I../../../include -I../../../ber_der/inc
-NSSINC=		-I/usr/include/mps
+NSSINC=		-I$(ADJUNCT_PROTO)/usr/include/mps
 BERLIB=		-lkmf -lkmfberder
 BERLIB64=	$(BERLIB)
 
-NSSLIBS=	$(BERLIB) -L$(MPSDIR) -R$(MPSDIR) -lnss3 -lnspr4 -lsmime3 -lc
-NSSLIBS64=	$(BERLIB64) -L$(MPSDIR)/$(MACH64) -R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc
+NSSLIBS=	$(BERLIB) -L$(ADJUNCT_PROTO)$(MPSDIR) -R$(MPSDIR) \
+		-lnss3 -lnspr4 -lsmime3 -lc
+NSSLIBS64=	$(BERLIB64) -L$(ADJUNCT_PROTO)$(MPSDIR)/$(MACH64) \
+		-R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc
 
 SRCDIR=		../common
 INCDIR=		../../include
 
 CFLAGS		+=	$(CCVERBOSE) 
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) $(NSSINC)  \
-		-I$(SFWDIR)/include -I$(INCDIR) -I/usr/include/libxml2
+		-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 PICS=	$(OBJECTS:%=pics/%)
 
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -48,7 +48,7 @@
 
 CFLAGS		+=	$(CCVERBOSE) 
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) \
-			-I$(INCDIR) -I/usr/include/libxml2
+			-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
 CERRWARN	+=	-_gcc=-Wno-unused-value
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -49,7 +49,8 @@
 
 
 CFLAGS		+=	$(CCVERBOSE)
-CPPFLAGS	+=	-D_REENTRANT $(KMFINC) -I$(INCDIR)  -I/usr/include/libxml2 -I$(BIGNUMDIR)
+CPPFLAGS	+=	-D_REENTRANT $(KMFINC) -I$(INCDIR) \
+			-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(BIGNUMDIR)
 LINTFLAGS64	+=	-errchk=longptr64
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
--- a/usr/src/lib/libldap5/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libldap5/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -57,7 +57,7 @@
 include ../../Makefile.lib
 
 NSS_LIBS=	-lnspr4 -lplc4 -lnss3 -lssl3
-NSS_HDRS=	/usr/include/mps
+NSS_HDRS=	$(ADJUNCT_PROTO)/usr/include/mps
 NSS_LDPATH=	/usr/lib/mps
 NSS_LDPATH64=	$(NSS_LDPATH)/64	
 
--- a/usr/src/lib/libldap5/amd64/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libldap5/amd64/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -2,15 +2,13 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 PR_MDUSOBJS = os_SunOS_x86.o
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LDLIBS +=	-L$(NSS_LDPATH64) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH64)
 
 all: $(LIBS)
--- a/usr/src/lib/libldap5/i386/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libldap5/i386/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/i386/Makefile
 #
 
@@ -11,7 +9,7 @@
 
 include ../Makefile.com
 
-LDLIBS +=	-L$(NSS_LDPATH) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH)
 
 all: $(LIBS)
--- a/usr/src/lib/libldap5/sparc/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libldap5/sparc/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/sparc/Makefile
 #
 
@@ -11,7 +9,7 @@
 
 include ../Makefile.com
 
-LDLIBS +=	-L$(NSS_LDPATH) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH)
 
 
--- a/usr/src/lib/libldap5/sparcv9/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libldap5/sparcv9/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -2,8 +2,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/libldap5/sparcv9/Makefile
 #
 
@@ -12,7 +10,7 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-LDLIBS +=	-L$(NSS_LDPATH64) $(NSS_LIBS)
+LDLIBS +=	-L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS)
 DYNFLAGS +=	-R$(NSS_LDPATH64)
 
 all: $(LIBS)
--- a/usr/src/lib/libpool/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libpool/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -48,7 +48,8 @@
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2
+CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
--- a/usr/src/lib/libshare/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libshare/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -45,7 +45,8 @@
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
-CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2
+CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2
 
 .KEEP_STATE:
 
--- a/usr/src/lib/libshare/autofs/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libshare/autofs/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -49,8 +49,9 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I$(AUTOFSSMFLIB_DIR) -I/usr/include/libxml2 \
-			-I$(SRCDIR)../common
+CPPFLAGS +=	-D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \
+			-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+  			-I$(SRCDIR)../common
 
 .KEEP_STATE:
 
--- a/usr/src/lib/libshare/nfs/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libshare/nfs/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -50,8 +50,8 @@
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 \
-			-I$(SRCDIR)/../common
+CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
+		-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common
 
 .KEEP_STATE:
 
--- a/usr/src/lib/libshare/smb/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libshare/smb/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -51,8 +51,8 @@
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-switch
-CPPFLAGS +=	-D_REENTRANT -I/usr/include/libxml2 \
-		-I$(SRCDIR)/../common
+CPPFLAGS +=	-D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+  		-I$(SRCDIR)/../common
 $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS
 
 .KEEP_STATE:
--- a/usr/src/lib/libshare/smbfs/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libshare/smbfs/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -43,8 +43,8 @@
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
-CPPFLAGS +=	-D_REENTRANT -I/usr/include/libxml2 -I$(SRCDIR)/../common \
-		-I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common
+CPPFLAGS +=	-D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
+		-I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common
 
 .KEEP_STATE:
 
--- a/usr/src/lib/libsldap/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libsldap/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -47,7 +47,7 @@
 CFLAGS +=	$(CCVERBOSE)
 LOCFLAGS +=	-D_REENTRANT -DSUNW_OPTIONS
 CPPFLAGS +=	-I../common -I$(SRC)/lib/libldap5/include/ldap \
-		-I/usr/include/mps $(LOCFLAGS)
+		-I$(ADJUNCT_PROTO)/usr/include/mps $(LOCFLAGS)
 LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
--- a/usr/src/lib/libzonecfg/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/libzonecfg/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -35,7 +35,7 @@
 $(DYNLIB) :=	LDLIBS += -lxml2
 
 SRCDIR =	../common
-CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
--- a/usr/src/lib/lvm/libsvm/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/lvm/libsvm/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=      	libsvm.a 
 VERS=          	.1 
@@ -46,7 +44,7 @@
 # XXX There isn't a lint library for libspmicommon.  For now, we work
 # around this by only using the library when we build (as opposed to lint).
 #
-all debug install := LDLIBS += -L/usr/snadm/lib -lspmicommon
+all debug install := LDLIBS += -L$(ADJUNCT_PROTO)/usr/snadm/lib -lspmicommon
 
 DYNFLAGS +=	-R/usr/snadm/lib
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -66,14 +66,14 @@
 
 LIBS=$(DYNLIB) $(DYNLIB64)
 
-TSSROOT=
+TSSROOT=$(ADJUNCT_PROTO)
 TSPILIBDIR=$(TSSROOT)/usr/lib
 TSPIINCDIR=$(TSSROOT)/usr/include
 TSSLIB=-L$(TSPILIBDIR)
 TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
 TSSINC=-I$(TSPIINCDIR)
 
-LDLIBS += $(TSSLIB) -L/lib -lc -luuid -lmd -ltspi -lcrypto
+LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto
 CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
 CPPFLAGS64 += $(CPPFLAGS)
 C99MODE=        $(C99_ENABLE)
--- a/usr/src/lib/policykit/Makefile.policykit	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/policykit/Makefile.policykit	Wed Jul 17 17:05:07 2013 -0700
@@ -22,15 +22,16 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Definitions common for PolicyKit
 #
 
 POLICYKIT_VERSION = 0.2
 
-POLICYKIT_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
-POLICYKIT_GLIB_CPPFLAGS = 	-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+POLICYKIT_DBUS_CPPFLAGS =	-DDBUS_API_SUBJECT_TO_CHANGE \
+				-I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \
+				-I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include
+POLICYKIT_GLIB_CPPFLAGS = 	-I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \
+				-I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include
 
 POLICYKIT_DBUS_LDLIBS =	-ldbus-1
 POLICYKIT_GLIB_LDLIBS =	-lglib-2.0
--- a/usr/src/lib/pylibbe/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/pylibbe/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -44,7 +44,8 @@
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lbe -lnvpair -lc
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-I/usr/include/python2.6 -D_FILE_OFFSET_BITS=64 -I../../libbe/common
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6 \
+		-D_FILE_OFFSET_BITS=64 -I../../libbe/common
 
 .KEEP_STATE:
 
--- a/usr/src/lib/pysolaris/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/pysolaris/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -45,7 +45,7 @@
 LDLIBS +=	-lc -lsec -lidmap -lpython2.6
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
 
 .KEEP_STATE:
 
--- a/usr/src/lib/pyzfs/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/lib/pyzfs/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -48,7 +48,7 @@
 LDLIBS +=	-lc -lnvpair -lpython2.6 -lzfs
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-unused-variable
-CPPFLAGS +=	-I/usr/include/python2.6
+CPPFLAGS +=	-I$(ADJUNCT_PROTO)/usr/include/python2.6
 CPPFLAGS +=	-I../../../uts/common/fs/zfs
 CPPFLAGS +=	-I../../../common/zfs
 
--- a/usr/src/tools/ctf/Makefile.ctf	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/tools/ctf/Makefile.ctf	Wed Jul 17 17:05:07 2013 -0700
@@ -40,7 +40,8 @@
 	-I../../common \
 	-I$(SRC) \
 	-I/usr/include \
-	-I$(SRC)/uts/common
+	-I$(SRC)/uts/common \
+	-I$(NATIVE_ADJUNCT)/include
 
 CPPFLAGS += $(HDRDIRS)
 CFLAGS += $(CCVERBOSE)
--- a/usr/src/tools/ctf/cvt/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/tools/ctf/cvt/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -73,6 +73,7 @@
 	-ldwarf
 DWARFCPPFLAGS	= -I../../dwarf/common
 
+LDFLAGS		+= -L$(NATIVE_ADJUNCT)/lib
 LDLIBS		+= -lz -lelf
 CPPFLAGS	+= -D_REENTRANT
 CFLAGS		+= $(CTF_FLAGS)
--- a/usr/src/tools/ctf/dump/Makefile.com	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/tools/ctf/dump/Makefile.com	Wed Jul 17 17:05:07 2013 -0700
@@ -31,6 +31,7 @@
 
 include ../../Makefile.ctf
 
+LDFLAGS += -L$(NATIVE_ADJUNCT)/lib
 LDLIBS += -lelf -lz
 
 OBJS = $(SRCS:%.c=%.o)
--- a/usr/src/tools/scripts/nightly.sh	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/tools/scripts/nightly.sh	Wed Jul 17 17:05:07 2013 -0700
@@ -1630,7 +1630,7 @@
 PARENT_ROOT=
 
 export ENVLDLIBS3 ENVCPPFLAGS1 ENVCPPFLAGS2 ENVCPPFLAGS3 ENVCPPFLAGS4 \
-	PARENT_ROOT
+	ENVLDLIBS1 ENVLDLIBS2 PARENT_ROOT
 
 PKGARCHIVE_ORIG=$PKGARCHIVE
 IA32_IHV_PKGS_ORIG=$IA32_IHV_PKGS
--- a/usr/src/uts/intel/tpm/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/uts/intel/tpm/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -61,7 +61,7 @@
 CPPFLAGS	+= -I$(ROOT)/usr/include
 
 # This is for /usr/include/tss/, which is not built in the ON consolidation
-CPPFLAGS	+= -I/usr/include
+CPPFLAGS	+= -I$(ADJUNCT_PROTO)/usr/include
 
 CERRWARN	+= -_gcc=-Wno-parentheses
 
--- a/usr/src/uts/sun4v/tpm/Makefile	Thu Aug 15 11:11:41 2013 -0700
+++ b/usr/src/uts/sun4v/tpm/Makefile	Wed Jul 17 17:05:07 2013 -0700
@@ -71,7 +71,7 @@
 CPPFLAGS	+= -I$(ROOT)/usr/include
 
 # This is for /usr/include/tss/, which is not built in the ON consolidation
-CPPFLAGS        += -I/usr/include
+CPPFLAGS        += -I$(ADJUNCT_PROTO)/usr/include
 
 LDFLAGS += -dy -Nmisc/kcf