--- a/usr/src/Makefile.master	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/Makefile.master	Thu Dec 09 22:32:39 2010 +0100
@@ -504,6 +504,7 @@
 DTS_ERRNO=-D_TS_ERRNO
 CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
 	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
+CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
 CPPFLAGS=	$(CPPFLAGS.master)
 AS_CPPFLAGS=	$(CPPFLAGS.master)
 JAVAFLAGS=	-deprecation

--- a/usr/src/lib/libc/Makefile	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/Makefile	Thu Dec 09 22:32:39 2010 +0100
@@ -142,8 +142,6 @@
 		exit 1; \
 	fi
 
-$(MACHLIBS):	$(MACH_COMP) $(MACH)/assym.h
-
 lib64:	$(MACH_COMP) $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64)
 	@if $(ELFDUMP) -r $(MACH64)/$(DYNLIB) | $(GREP) -w environ ; then \
 		$(ECHO) "Error: Invalid reference to environ" ; \
@@ -151,8 +149,6 @@
 		exit 1; \
 	fi
 
-$(MACHLIBS64):	$(MACH_COMP) $(MACH64)/assym.h
-
 $(MACH)/assym.h $(MACH64)/assym.h:
 	@cd $(@D); $(MAKE) assym.h
 
@@ -181,7 +177,9 @@
 		$(ROOTFS_LINTLIB64) \
 		$(ROOTVARIANTLIBS64)
 
-install_h: $(ROOTHDRS)
+install_h: all_h $(ROOTHDRS)
+
+all_h:	$(MACH)/assym.h $(MACH64)/assym.h
 
 check:	$(CHECKHDRS)
 

--- a/usr/src/lib/libc/amd64/Makefile	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/amd64/Makefile	Thu Dec 09 22:32:39 2010 +0100
@@ -1190,14 +1190,9 @@
 
 GENASSYM_C = genassym.c
 
-# XXX	A hack.  Perhaps this should be 'CPPFLAGS.native' and
-#	live in Makefile.master
-
-CPPFLAGS.genassym = \
-	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
-
 genassym: $(GENASSYM_C)
-	$(NATIVECC) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C)
+	$(NATIVECC) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.native)	\
+		-o $@ $(GENASSYM_C)
 
 OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
 

--- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile	Thu Dec 09 22:32:39 2010 +0100
@@ -29,11 +29,6 @@
 
 .KEEP_STATE:
 
-all install:	$(LIBCBASE)/$(MACH)/assym.h $(SYMCAP)
-
-# We need assym.h, but it won't build directly. smt_pause.o depends on
-# assym.h, so building it forces assym.h to be built.
-$(LIBCBASE)/$(MACH)/assym.h:
-	@cd $(LIBCBASE)/$(MACH); $(MAKE) pics/smt_pause.o
+all install:	$(SYMCAP)
 
 include		../../Makefile.targ

--- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile	Thu Dec 09 22:32:39 2010 +0100
@@ -29,11 +29,6 @@
 AS_CPPFLAGS +=	-D__sparcv9
 ASFLAGS +=	-xarch=v9 -I$(LIBCBASE)/$(MACH64)
 
-all install:	$(LIBCBASE)/$(MACH64)/assym.h $(SYMCAP)
-
-# We need assym.h, but it won't build directly. smt_pause.o depends on
-# assym.h, so building it forces assym.h to be built.
-$(LIBCBASE)/$(MACH64)/assym.h:
-	@cd $(LIBCBASE)/$(MACH64); $(MAKE) pics/smt_pause.o
+all install:	$(SYMCAP)
 
 include		../../Makefile.targ

--- a/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s	Thu Dec 09 22:32:39 2010 +0100
@@ -38,7 +38,7 @@
 #include <sys/stack.h>
 
 #if defined(NIAGARA_IMPL)
-#include "assym.h"
+#include <assym.h>
 #endif
 
 	ENTRY(smt_pause)

--- a/usr/src/lib/libc/i386/Makefile.com	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/i386/Makefile.com	Thu Dec 09 22:32:39 2010 +0100
@@ -1262,15 +1262,9 @@
 
 GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 
-# XXX	A hack.  Perhaps this should be 'CPPFLAGS.native' and
-#	live in Makefile.master
-
-CPPFLAGS.genassym = \
-	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4)
-
 genassym: $(GENASSYM_C)
 	$(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc	\
-		-D__EXTENSIONS__ $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C)
+		-D__EXTENSIONS__ $(CPPFLAGS.native) -o $@ $(GENASSYM_C)
 
 OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
 

--- a/usr/src/lib/libc/sparc/Makefile.com	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/sparc/Makefile.com	Thu Dec 09 22:32:39 2010 +0100
@@ -1339,19 +1339,13 @@
 
 # assym.h build rules
 
-GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
-
-# XXX	A hack.  Perhaps this should be 'CPPFLAGS.native' and
-#	live in Makefile.master
-
 assym.h := CFLAGS += -g
 
-CPPFLAGS.genassym = \
-	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) -I.
+GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 
 genassym: $(GENASSYM_C)
 	$(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \
-		$(CPPFLAGS.genassym) -o $@ $(GENASSYM_C)
+		$(CPPFLAGS.native) -o $@ $(GENASSYM_C)
 
 OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
 

--- a/usr/src/lib/libc/sparcv9/Makefile.com	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/lib/libc/sparcv9/Makefile.com	Thu Dec 09 22:32:39 2010 +0100
@@ -1267,15 +1267,9 @@
 
 GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
 
-# XXX	A hack.  Perhaps this should be 'CPPFLAGS.native' and
-#	live in Makefile.master
-
-CPPFLAGS.genassym = \
-	$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) -I.
-
 genassym: $(GENASSYM_C)
 	$(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \
-		$(CPPFLAGS.genassym) -o $@ $(GENASSYM_C)
+		$(CPPFLAGS.native) -o $@ $(GENASSYM_C)
 
 OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
 

--- a/usr/src/pkg/Makefile	Wed Dec 08 20:51:19 2010 -0500
+++ b/usr/src/pkg/Makefile	Thu Dec 09 22:32:39 2010 +0100
@@ -227,6 +227,12 @@
 PROC_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.mog)
 
 #
+# Root of pkg image to use for dependency resolution
+# Normally / on the machine used to build the binaries
+#
+PKGDEP_RESOLVE_IMAGE = /
+
+#
 # For each package, we determine the target repository based on
 # manifest-embedded metadata.  Because we make that determination on
 # the fly, the publication target cannot be expressed as a
@@ -364,7 +370,8 @@
 		done; \
 	else \
 		print "Resolving dependencies"; \
-		pkgdepend resolve -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \
+		pkgdepend -R $(PKGDEP_RESOLVE_IMAGE) resolve \
+		    -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \
 		for p in $(DEP_SYNTH_PKGS:%.dep=%) $(DEP_PKGS:%.dep=%); do \
 			if [ "$$(print $$p.metadata.*)" = \
 			     "$$(print $$p.metadata.noincorp.*)" ]; \