--- a/components/gcc3/gcc-3.p5m	Tue Nov 22 15:10:35 2011 -0800
+++ b/components/gcc3/gcc-3.p5m	Tue Nov 22 22:14:28 2011 -0800
@@ -480,7 +480,7 @@
 
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/ld type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require variant.arch=i386
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o type=require

--- a/transforms/variant-cleanup	Tue Nov 22 15:10:35 2011 -0800
+++ b/transforms/variant-cleanup	Tue Nov 22 22:14:28 2011 -0800
@@ -28,7 +28,7 @@
 #
 
 # drop actions that don't apply to the architecture we are on
-<transform dir file link hardlink variant.arch=(?!$(MACH)) -> drop>
+<transform depend dir file link hardlink variant.arch=(?!$(MACH)) -> drop>
 
 # delete variant.arch from the manifest
-<transform dir file link hardlink -> delete variant.arch .*>
+<transform depend dir file link hardlink -> delete variant.arch .*>